diff mbox series

watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly

Message ID 1558603778-20848-2-git-send-email-na-hoan@jinso.co.jp (mailing list archive)
State Accepted
Headers show
Series watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly | expand

Commit Message

グェン・アン・ホァン May 23, 2019, 9:29 a.m. UTC 
From: Hoan Nguyen An <na-hoan@jinso.co.jp>

Add helper variable dev = &pdev->dev

Signed-off-by: Hoan Nguyen An <na-hoan@jinso.co.jp>
---
 drivers/watchdog/renesas_wdt.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

Comments

Wolfram Sang May 23, 2019, 11:06 a.m. UTC | #1 
Hi,

On Thu, May 23, 2019 at 06:29:38PM +0900, Nguyen An Hoan wrote:
> From: Hoan Nguyen An <na-hoan@jinso.co.jp>
> 
> Add helper variable dev = &pdev->dev
> 
> Signed-off-by: Hoan Nguyen An <na-hoan@jinso.co.jp>

Hmm, I leave the decision to Guenter. Dunno if there is a subsystem
preference. I personally don't think it adds value but I am not against
it.

Regards,

   Wolfram
Guenter Roeck May 27, 2019, 4:22 p.m. UTC | #2 
On 5/23/19 4:06 AM, Wolfram Sang wrote:
> Hi,
> 
> On Thu, May 23, 2019 at 06:29:38PM +0900, Nguyen An Hoan wrote:
>> From: Hoan Nguyen An <na-hoan@jinso.co.jp>
>>
>> Add helper variable dev = &pdev->dev
>>
>> Signed-off-by: Hoan Nguyen An <na-hoan@jinso.co.jp>
> 
> Hmm, I leave the decision to Guenter. Dunno if there is a subsystem
> preference. I personally don't think it adds value but I am not against
> it.
> 

I like it because it makes the code easier to read.

Guenter
Geert Uytterhoeven May 28, 2019, 7:38 a.m. UTC | #3 
On Thu, May 23, 2019 at 11:30 AM Nguyen An Hoan <na-hoan@jinso.co.jp> wrote:
> From: Hoan Nguyen An <na-hoan@jinso.co.jp>
>
> Add helper variable dev = &pdev->dev
>
> Signed-off-by: Hoan Nguyen An <na-hoan@jinso.co.jp>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert
Guenter Roeck June 7, 2019, 5:31 p.m. UTC | #4 
On Thu, May 23, 2019 at 06:29:38PM +0900, Nguyen An Hoan wrote:
> From: Hoan Nguyen An <na-hoan@jinso.co.jp>
> 
> Add helper variable dev = &pdev->dev
> 
> Signed-off-by: Hoan Nguyen An <na-hoan@jinso.co.jp>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/renesas_wdt.c | 21 +++++++++++----------
>  1 file changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
> index 565dbc1..d8ac229 100644
> --- a/drivers/watchdog/renesas_wdt.c
> +++ b/drivers/watchdog/renesas_wdt.c
> @@ -175,15 +175,16 @@ static inline bool rwdt_blacklisted(struct device *dev) { return false; }
>  
>  static int rwdt_probe(struct platform_device *pdev)
>  {
> +	struct device *dev = &pdev->dev;
>  	struct rwdt_priv *priv;
>  	struct clk *clk;
>  	unsigned long clks_per_sec;
>  	int ret, i;
>  
> -	if (rwdt_blacklisted(&pdev->dev))
> +	if (rwdt_blacklisted(dev))
>  		return -ENODEV;
>  
> -	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
> +	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
>  	if (!priv)
>  		return -ENOMEM;
>  
> @@ -191,16 +192,16 @@ static int rwdt_probe(struct platform_device *pdev)
>  	if (IS_ERR(priv->base))
>  		return PTR_ERR(priv->base);
>  
> -	clk = devm_clk_get(&pdev->dev, NULL);
> +	clk = devm_clk_get(dev, NULL);
>  	if (IS_ERR(clk))
>  		return PTR_ERR(clk);
>  
> -	pm_runtime_enable(&pdev->dev);
> -	pm_runtime_get_sync(&pdev->dev);
> +	pm_runtime_enable(dev);
> +	pm_runtime_get_sync(dev);
>  	priv->clk_rate = clk_get_rate(clk);
>  	priv->wdev.bootstatus = (readb_relaxed(priv->base + RWTCSRA) &
>  				RWTCSRA_WOVF) ? WDIOF_CARDRESET : 0;
> -	pm_runtime_put(&pdev->dev);
> +	pm_runtime_put(dev);
>  
>  	if (!priv->clk_rate) {
>  		ret = -ENOENT;
> @@ -216,14 +217,14 @@ static int rwdt_probe(struct platform_device *pdev)
>  	}
>  
>  	if (i < 0) {
> -		dev_err(&pdev->dev, "Can't find suitable clock divider\n");
> +		dev_err(dev, "Can't find suitable clock divider\n");
>  		ret = -ERANGE;
>  		goto out_pm_disable;
>  	}
>  
>  	priv->wdev.info = &rwdt_ident;
>  	priv->wdev.ops = &rwdt_ops;
> -	priv->wdev.parent = &pdev->dev;
> +	priv->wdev.parent = dev;
>  	priv->wdev.min_timeout = 1;
>  	priv->wdev.max_timeout = DIV_BY_CLKS_PER_SEC(priv, 65536);
>  	priv->wdev.timeout = min(priv->wdev.max_timeout, RWDT_DEFAULT_TIMEOUT);
> @@ -235,7 +236,7 @@ static int rwdt_probe(struct platform_device *pdev)
>  	watchdog_stop_on_unregister(&priv->wdev);
>  
>  	/* This overrides the default timeout only if DT configuration was found */
> -	watchdog_init_timeout(&priv->wdev, 0, &pdev->dev);
> +	watchdog_init_timeout(&priv->wdev, 0, dev);
>  
>  	ret = watchdog_register_device(&priv->wdev);
>  	if (ret < 0)
> @@ -244,7 +245,7 @@ static int rwdt_probe(struct platform_device *pdev)
>  	return 0;
>  
>   out_pm_disable:
> -	pm_runtime_disable(&pdev->dev);
> +	pm_runtime_disable(dev);
>  	return ret;
>  }
>
Simon Horman June 13, 2019, 9:28 a.m. UTC | #5 
On Fri, Jun 07, 2019 at 10:31:52AM -0700, Guenter Roeck wrote:
> On Thu, May 23, 2019 at 06:29:38PM +0900, Nguyen An Hoan wrote:
> > From: Hoan Nguyen An <na-hoan@jinso.co.jp>
> > 
> > Add helper variable dev = &pdev->dev
> > 
> > Signed-off-by: Hoan Nguyen An <na-hoan@jinso.co.jp>
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
diff mbox series

Patch

diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
index 565dbc1..d8ac229 100644
--- a/drivers/watchdog/renesas_wdt.c
+++ b/drivers/watchdog/renesas_wdt.c
@@ -175,15 +175,16 @@  static inline bool rwdt_blacklisted(struct device *dev) { return false; }
 
 static int rwdt_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
 	struct rwdt_priv *priv;
 	struct clk *clk;
 	unsigned long clks_per_sec;
 	int ret, i;
 
-	if (rwdt_blacklisted(&pdev->dev))
+	if (rwdt_blacklisted(dev))
 		return -ENODEV;
 
-	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
 
@@ -191,16 +192,16 @@  static int rwdt_probe(struct platform_device *pdev)
 	if (IS_ERR(priv->base))
 		return PTR_ERR(priv->base);
 
-	clk = devm_clk_get(&pdev->dev, NULL);
+	clk = devm_clk_get(dev, NULL);
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
 
-	pm_runtime_enable(&pdev->dev);
-	pm_runtime_get_sync(&pdev->dev);
+	pm_runtime_enable(dev);
+	pm_runtime_get_sync(dev);
 	priv->clk_rate = clk_get_rate(clk);
 	priv->wdev.bootstatus = (readb_relaxed(priv->base + RWTCSRA) &
 				RWTCSRA_WOVF) ? WDIOF_CARDRESET : 0;
-	pm_runtime_put(&pdev->dev);
+	pm_runtime_put(dev);
 
 	if (!priv->clk_rate) {
 		ret = -ENOENT;
@@ -216,14 +217,14 @@  static int rwdt_probe(struct platform_device *pdev)
 	}
 
 	if (i < 0) {
-		dev_err(&pdev->dev, "Can't find suitable clock divider\n");
+		dev_err(dev, "Can't find suitable clock divider\n");
 		ret = -ERANGE;
 		goto out_pm_disable;
 	}
 
 	priv->wdev.info = &rwdt_ident;
 	priv->wdev.ops = &rwdt_ops;
-	priv->wdev.parent = &pdev->dev;
+	priv->wdev.parent = dev;
 	priv->wdev.min_timeout = 1;
 	priv->wdev.max_timeout = DIV_BY_CLKS_PER_SEC(priv, 65536);
 	priv->wdev.timeout = min(priv->wdev.max_timeout, RWDT_DEFAULT_TIMEOUT);
@@ -235,7 +236,7 @@  static int rwdt_probe(struct platform_device *pdev)
 	watchdog_stop_on_unregister(&priv->wdev);
 
 	/* This overrides the default timeout only if DT configuration was found */
-	watchdog_init_timeout(&priv->wdev, 0, &pdev->dev);
+	watchdog_init_timeout(&priv->wdev, 0, dev);
 
 	ret = watchdog_register_device(&priv->wdev);
 	if (ret < 0)
@@ -244,7 +245,7 @@  static int rwdt_probe(struct platform_device *pdev)
 	return 0;
 
  out_pm_disable:
-	pm_runtime_disable(&pdev->dev);
+	pm_runtime_disable(dev);
 	return ret;
 }