From: Guenter Roeck <linux@roeck-us.net>
To: Fabio Estevam <festevam@gmail.com>
Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org,
Anson.Huang@nxp.com, shawnguo@kernel.org, linux-imx@nxp.com,
kernel@pengutronix.de
Subject: Re: [PATCH 2/5] watchdog: imx7ulp: Pass the wdog instance inimx7ulp_wdt_enable()
Date: Sat, 2 Nov 2019 08:37:53 -0700 [thread overview]
Message-ID: <20191102153753.GA5880@roeck-us.net> (raw)
In-Reply-To: <20191029174037.25381-2-festevam@gmail.com>
On Tue, Oct 29, 2019 at 02:40:34PM -0300, Fabio Estevam wrote:
> It is more natural to pass the watchdog instance inside
> imx7ulp_wdt_enable() instead of the base address.
>
> This also has the benefit to reduce the code a bit.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/imx7ulp_wdt.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c
> index ba5d535a6db2..eea415609d44 100644
> --- a/drivers/watchdog/imx7ulp_wdt.c
> +++ b/drivers/watchdog/imx7ulp_wdt.c
> @@ -47,15 +47,17 @@ struct imx7ulp_wdt_device {
> struct clk *clk;
> };
>
> -static inline void imx7ulp_wdt_enable(void __iomem *base, bool enable)
> +static inline void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable)
> {
> - u32 val = readl(base + WDOG_CS);
> + struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog);
> +
> + u32 val = readl(wdt->base + WDOG_CS);
>
> - writel(UNLOCK, base + WDOG_CNT);
> + writel(UNLOCK, wdt->base + WDOG_CNT);
> if (enable)
> - writel(val | WDOG_CS_EN, base + WDOG_CS);
> + writel(val | WDOG_CS_EN, wdt->base + WDOG_CS);
> else
> - writel(val & ~WDOG_CS_EN, base + WDOG_CS);
> + writel(val & ~WDOG_CS_EN, wdt->base + WDOG_CS);
> }
>
> static inline bool imx7ulp_wdt_is_enabled(void __iomem *base)
> @@ -76,18 +78,15 @@ static int imx7ulp_wdt_ping(struct watchdog_device *wdog)
>
> static int imx7ulp_wdt_start(struct watchdog_device *wdog)
> {
> - struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog);
>
> - imx7ulp_wdt_enable(wdt->base, true);
> + imx7ulp_wdt_enable(wdog, true);
>
> return 0;
> }
>
> static int imx7ulp_wdt_stop(struct watchdog_device *wdog)
> {
> - struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog);
> -
> - imx7ulp_wdt_enable(wdt->base, false);
> + imx7ulp_wdt_enable(wdog, false);
>
> return 0;
> }
> @@ -109,10 +108,8 @@ static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog,
> static int imx7ulp_wdt_restart(struct watchdog_device *wdog,
> unsigned long action, void *data)
> {
> - struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog);
> -
> - imx7ulp_wdt_enable(wdt->base, true);
> - imx7ulp_wdt_set_timeout(&wdt->wdd, 1);
> + imx7ulp_wdt_enable(wdog, true);
> + imx7ulp_wdt_set_timeout(wdog, 1);
>
> /* wait for wdog to fire */
> while (true)
next prev parent reply other threads:[~2019-11-02 15:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 17:40 [PATCH 1/5] watchdog: imx7ulp: Fix reboot hang Fabio Estevam
2019-10-29 17:40 ` [PATCH 2/5] watchdog: imx7ulp: Pass the wdog instance inimx7ulp_wdt_enable() Fabio Estevam
2019-11-02 15:37 ` Guenter Roeck [this message]
2019-10-29 17:40 ` [PATCH 3/5] watchdog: imx7ulp: Remove unused structure member Fabio Estevam
2019-11-02 15:39 ` Guenter Roeck
2019-10-29 17:40 ` [PATCH 4/5] watchdog: imx7ulp: Remove inline annotations Fabio Estevam
2019-11-02 15:39 ` Guenter Roeck
2019-10-29 17:40 ` [PATCH 5/5] watchdog: imx7ulp: Use definitions instead of magic values Fabio Estevam
2019-11-02 15:41 ` Guenter Roeck
2019-11-02 15:36 ` [PATCH 1/5] watchdog: imx7ulp: Fix reboot hang Guenter Roeck
2019-11-04 13:45 ` Fabio Estevam
2019-11-04 14:06 ` Guenter Roeck
2019-11-07 17:46 ` Fabio Estevam
2019-11-08 14:39 ` Guenter Roeck
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=20191102153753.GA5880@roeck-us.net \
--to=linux@roeck-us.net \
--cc=Anson.Huang@nxp.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=shawnguo@kernel.org \
--cc=wim@linux-watchdog.org \
/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).