From: Rosen Penev <rosenp@gmail.com>
To: linux-watchdog@vger.kernel.org
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] watchdog: orion: Use of_device_get_match_data()
Date: Mon, 18 May 2026 17:37:42 -0700 [thread overview]
Message-ID: <20260519003742.626477-1-rosenp@gmail.com> (raw)
Use of_device_get_match_data() to fetch watchdog match data directly
instead of open-coding an of_match_device() lookup.
Keep the existing legacy fallback when no match data is available.
This also lets the driver drop the of_device.h include.
Assisted-by: Codex:GPT-5.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/watchdog/orion_wdt.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 0e145f762f6f..a92701ff2653 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -21,7 +21,6 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/of.h>
-#include <linux/of_device.h>
/* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */
#define ORION_RSTOUT_MASK_OFFSET 0x20108
@@ -554,7 +553,6 @@ static int orion_wdt_get_regs(struct platform_device *pdev,
static int orion_wdt_probe(struct platform_device *pdev)
{
struct orion_watchdog *dev;
- const struct of_device_id *match;
unsigned int wdt_max_duration; /* (seconds) */
int ret, irq;
@@ -563,15 +561,14 @@ static int orion_wdt_probe(struct platform_device *pdev)
if (!dev)
return -ENOMEM;
- match = of_match_device(orion_wdt_of_match_table, &pdev->dev);
- if (!match)
+ dev->data = of_device_get_match_data(&pdev->dev);
+ if (!dev->data)
/* Default legacy match */
- match = &orion_wdt_of_match_table[0];
+ dev->data = orion_wdt_of_match_table[0].data;
dev->wdt.info = &orion_wdt_info;
dev->wdt.ops = &orion_wdt_ops;
dev->wdt.min_timeout = 1;
- dev->data = match->data;
ret = orion_wdt_get_regs(pdev, dev);
if (ret)
--
2.54.0
reply other threads:[~2026-05-19 0:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260519003742.626477-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--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
all inboxes | Powered by JetHome®