* [PATCH] watchdog: st_lpc: Use device_get_match_data()
@ 2023-10-09 21:13 Rob Herring
2023-10-10 6:29 ` Patrice CHOTARD
2023-10-10 13:35 ` Guenter Roeck
0 siblings, 2 replies; 3+ messages in thread
From: Rob Herring @ 2023-10-09 21:13 UTC (permalink / raw)
To: Patrice Chotard, Wim Van Sebroeck, Guenter Roeck
Cc: linux-arm-kernel, linux-watchdog, linux-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] watchdog: st_lpc: Use device_get_match_data()
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
1 sibling, 0 replies; 3+ messages in thread
From: Patrice CHOTARD @ 2023-10-10 6:29 UTC (permalink / raw)
To: Rob Herring, Wim Van Sebroeck, Guenter Roeck
Cc: linux-arm-kernel, linux-watchdog, linux-kernel
On 10/9/23 23:13, 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>
> ---
> 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))
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] watchdog: st_lpc: Use device_get_match_data()
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
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2023-10-10 13:35 UTC (permalink / raw)
To: Rob Herring
Cc: Patrice Chotard, Wim Van Sebroeck, linux-arm-kernel,
linux-watchdog, linux-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-10 13:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox