On Thu, May 23, 2019 at 06:29:38PM +0900, Nguyen An Hoan wrote: > From: Hoan Nguyen An <[email protected]> > > Add helper variable dev = &pdev->dev > > Signed-off-by: Hoan Nguyen An <[email protected]> > Reviewed-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]> > --- > 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; > } >
