From: Tian Tao <tiantao6@hisilicon.com>
To: <wim@linux-watchdog.org>, <linux@roeck-us.net>
Cc: <linux-watchdog@vger.kernel.org>,
Tian Tao <tiantao6@hisilicon.com>,
Yicong Yang <yangyicong@hisilicon.com>
Subject: [RESEND 1/1] watchdog: simplify devm_watchdog_register_device
Date: Fri, 21 May 2021 15:16:04 +0800 [thread overview]
Message-ID: <1621581364-31734-1-git-send-email-tiantao6@hisilicon.com> (raw)
Use devm_add_action_or_reset() instead of devres_alloc() and
devres_add(), which works the same. This will simplify the
code. There is no functional changes.
Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
drivers/watchdog/watchdog_core.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index 5df0a22..cea6080 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -364,9 +364,9 @@ void watchdog_unregister_device(struct watchdog_device *wdd)
EXPORT_SYMBOL_GPL(watchdog_unregister_device);
-static void devm_watchdog_unregister_device(struct device *dev, void *res)
+static void devm_watchdog_unregister_device(void *wdd)
{
- watchdog_unregister_device(*(struct watchdog_device **)res);
+ watchdog_unregister_device(wdd);
}
/**
@@ -381,23 +381,14 @@ static void devm_watchdog_unregister_device(struct device *dev, void *res)
int devm_watchdog_register_device(struct device *dev,
struct watchdog_device *wdd)
{
- struct watchdog_device **rcwdd;
int ret;
- rcwdd = devres_alloc(devm_watchdog_unregister_device, sizeof(*rcwdd),
- GFP_KERNEL);
- if (!rcwdd)
- return -ENOMEM;
-
ret = watchdog_register_device(wdd);
- if (!ret) {
- *rcwdd = wdd;
- devres_add(dev, rcwdd);
- } else {
- devres_free(rcwdd);
- }
+ if (ret)
+ return ret;
- return ret;
+ return devm_add_action_or_reset(dev, devm_watchdog_unregister_device,
+ wdd);
}
EXPORT_SYMBOL_GPL(devm_watchdog_register_device);
--
2.7.4
next reply other threads:[~2021-05-21 7:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 7:16 Tian Tao [this message]
2021-05-21 11:07 ` [RESEND 1/1] watchdog: simplify devm_watchdog_register_device 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=1621581364-31734-1-git-send-email-tiantao6@hisilicon.com \
--to=tiantao6@hisilicon.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
--cc=yangyicong@hisilicon.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).