* [PATCH v2] staging: fieldbus: simplify devm_anybuss_host_common_probe
@ 2021-04-13 0:53 Tian Tao
2021-04-13 12:33 ` Sven Van Asbroeck
0 siblings, 1 reply; 2+ messages in thread
From: Tian Tao @ 2021-04-13 0:53 UTC (permalink / raw)
To: TheSven73; +Cc: gregkh, linux-staging, Tian Tao
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>
---
v2: Fix the problem of incorrect pointer assignment in host_release.
---
drivers/staging/fieldbus/anybuss/host.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/fieldbus/anybuss/host.c b/drivers/staging/fieldbus/anybuss/host.c
index 549cb7d5..c97df91 100644
--- a/drivers/staging/fieldbus/anybuss/host.c
+++ b/drivers/staging/fieldbus/anybuss/host.c
@@ -1406,32 +1406,26 @@ void anybuss_host_common_remove(struct anybuss_host *host)
}
EXPORT_SYMBOL_GPL(anybuss_host_common_remove);
-static void host_release(struct device *dev, void *res)
+static void host_release(void *res)
{
- struct anybuss_host **dr = res;
-
- anybuss_host_common_remove(*dr);
+ anybuss_host_common_remove(res);
}
struct anybuss_host * __must_check
devm_anybuss_host_common_probe(struct device *dev,
const struct anybuss_ops *ops)
{
- struct anybuss_host **dr;
struct anybuss_host *host;
-
- dr = devres_alloc(host_release, sizeof(struct anybuss_host *),
- GFP_KERNEL);
- if (!dr)
- return ERR_PTR(-ENOMEM);
+ int ret;
host = anybuss_host_common_probe(dev, ops);
- if (IS_ERR(host)) {
- devres_free(dr);
+ if (IS_ERR(host))
return host;
- }
- *dr = host;
- devres_add(dev, dr);
+
+ ret = devm_add_action_or_reset(dev, host_release, host);
+ if (ret)
+ return ERR_PTR(ret);
+
return host;
}
EXPORT_SYMBOL_GPL(devm_anybuss_host_common_probe);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] staging: fieldbus: simplify devm_anybuss_host_common_probe
2021-04-13 0:53 [PATCH v2] staging: fieldbus: simplify devm_anybuss_host_common_probe Tian Tao
@ 2021-04-13 12:33 ` Sven Van Asbroeck
0 siblings, 0 replies; 2+ messages in thread
From: Sven Van Asbroeck @ 2021-04-13 12:33 UTC (permalink / raw)
To: Tian Tao; +Cc: Greg KH, linux-staging
Looking good to me. Thank you for the contribution !
On Mon, Apr 12, 2021 at 8:52 PM Tian Tao <tiantao6@hisilicon.com> wrote:
>
> 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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-13 12:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-13 0:53 [PATCH v2] staging: fieldbus: simplify devm_anybuss_host_common_probe Tian Tao
2021-04-13 12:33 ` Sven Van Asbroeck
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).