From: Guenter Roeck <linux@roeck-us.net>
To: Rob Herring <robh@kernel.org>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] watchdog: st_lpc: Use device_get_match_data()
Date: Tue, 10 Oct 2023 06:35:24 -0700 [thread overview]
Message-ID: <d8e0403e-503a-4c85-b50e-eee48db68c89@roeck-us.net> (raw)
In-Reply-To: <20231009211356.3242037-18-robh@kernel.org>
On Mon, Oct 09, 2023 at 04:13:48PM -0500, Rob Herring wrote:
> Use preferred device_get_match_data() instead of of_match_device() to
> get the driver match data. With this, adjust the includes to explicitly
> include the correct headers.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/st_lpc_wdt.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
> index d2aa43c00221..4c5b8d98a4f3 100644
> --- a/drivers/watchdog/st_lpc_wdt.c
> +++ b/drivers/watchdog/st_lpc_wdt.c
> @@ -15,7 +15,6 @@
> #include <linux/mfd/syscon.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_platform.h>
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
> #include <linux/watchdog.h>
> @@ -42,7 +41,7 @@ struct st_wdog {
> void __iomem *base;
> struct device *dev;
> struct regmap *regmap;
> - struct st_wdog_syscfg *syscfg;
> + const struct st_wdog_syscfg *syscfg;
> struct clk *clk;
> unsigned long clkrate;
> bool warm_reset;
> @@ -150,7 +149,6 @@ static void st_clk_disable_unprepare(void *data)
> static int st_wdog_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> - const struct of_device_id *match;
> struct device_node *np = dev->of_node;
> struct st_wdog *st_wdog;
> struct regmap *regmap;
> @@ -173,12 +171,7 @@ static int st_wdog_probe(struct platform_device *pdev)
> if (!st_wdog)
> return -ENOMEM;
>
> - match = of_match_device(st_wdog_match, dev);
> - if (!match) {
> - dev_err(dev, "Couldn't match device\n");
> - return -ENODEV;
> - }
> - st_wdog->syscfg = (struct st_wdog_syscfg *)match->data;
> + st_wdog->syscfg = (struct st_wdog_syscfg *)device_get_match_data(dev);
>
> base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(base))
> --
> 2.42.0
>
prev parent reply other threads:[~2023-10-10 13:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 21:13 [PATCH] watchdog: st_lpc: Use device_get_match_data() Rob Herring
2023-10-10 6:29 ` Patrice CHOTARD
2023-10-10 13:35 ` Guenter Roeck [this message]
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=d8e0403e-503a-4c85-b50e-eee48db68c89@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=patrice.chotard@foss.st.com \
--cc=robh@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 read-only IMAP folder(s) and NNTP newsgroup(s).