From: Nguyen An Hoan <na-hoan@jinso.co.jp>
To: linux-renesas-soc@vger.kernel.org, geert+renesas@glider.be,
linux-watchdog@vger.kernel.org, wim@linux-watchdog.org,
linux@roeck-us.net, wsa+renesas@sang-engineering.com
Cc: kuninori.morimoto.gx@renesas.com,
yoshihiro.shimoda.uh@renesas.com, h-inayoshi@jinso.co.jp,
cv-dong@jinso.co.jp
Subject: [PATCH] watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly
Date: Thu, 23 May 2019 18:29:38 +0900 [thread overview]
Message-ID: <1558603778-20848-2-git-send-email-na-hoan@jinso.co.jp> (raw)
In-Reply-To: <1558603778-20848-1-git-send-email-na-hoan@jinso.co.jp>
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(-)
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;
}
--
2.7.4
next prev parent reply other threads:[~2019-05-23 9:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 9:29 [PATCH] watchdog: renesas_wdt: Fix interrupt enable for timer Nguyen An Hoan
2019-05-23 9:29 ` Nguyen An Hoan [this message]
2019-05-23 11:06 ` [PATCH] watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly Wolfram Sang
2019-05-27 16:22 ` Guenter Roeck
2019-05-28 7:38 ` Geert Uytterhoeven
2019-06-07 17:31 ` Guenter Roeck
2019-06-13 9:28 ` Simon Horman
2019-05-23 11:04 ` [PATCH] watchdog: renesas_wdt: Fix interrupt enable for timer Wolfram Sang
2019-05-23 11:26 ` Geert Uytterhoeven
2019-05-24 1:13 ` "グェン・アン・ホァン"
2019-05-24 2:01 ` Yoshihiro Shimoda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1558603778-20848-2-git-send-email-na-hoan@jinso.co.jp \
--to=na-hoan@jinso.co.jp \
--cc=cv-dong@jinso.co.jp \
--cc=geert+renesas@glider.be \
--cc=h-inayoshi@jinso.co.jp \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
--cc=wsa+renesas@sang-engineering.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).