From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Rob Herring <robh@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>,
Tony Lindgren <tony@atomide.com>
Subject: [PATCH v1 2/3] serdev: Simplify devm_serdev_device_open() function
Date: Tue, 24 Oct 2023 15:41:14 +0300 [thread overview]
Message-ID: <20231024124115.3598090-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20231024124115.3598090-1-andriy.shevchenko@linux.intel.com>
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/tty/serdev/core.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index e46448efc48d..6a1e75f98f16 100644
--- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c
@@ -187,30 +187,20 @@ void serdev_device_close(struct serdev_device *serdev)
}
EXPORT_SYMBOL_GPL(serdev_device_close);
-static void devm_serdev_device_release(struct device *dev, void *dr)
+static void devm_serdev_device_close(void *serdev)
{
- serdev_device_close(*(struct serdev_device **)dr);
+ serdev_device_close(serdev);
}
int devm_serdev_device_open(struct device *dev, struct serdev_device *serdev)
{
- struct serdev_device **dr;
int ret;
- dr = devres_alloc(devm_serdev_device_release, sizeof(*dr), GFP_KERNEL);
- if (!dr)
- return -ENOMEM;
-
ret = serdev_device_open(serdev);
- if (ret) {
- devres_free(dr);
+ if (ret)
return ret;
- }
- *dr = serdev;
- devres_add(dev, dr);
-
- return 0;
+ return devm_add_action_or_reset(dev, devm_serdev_device_close, serdev);
}
EXPORT_SYMBOL_GPL(devm_serdev_device_open);
--
2.40.0.1.gaa8946217a0b
next prev parent reply other threads:[~2023-10-24 12:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 12:41 [PATCH v1 0/3] serdev: Update a few places to use new APIs Andy Shevchenko
2023-10-24 12:41 ` [PATCH v1 1/3] serdev: Make use of device_set_node() Andy Shevchenko
2023-10-24 12:41 ` Andy Shevchenko [this message]
2023-10-24 12:41 ` [PATCH v1 3/3] serdev: Replace custom code with device_match_acpi_handle() Andy Shevchenko
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=20231024124115.3598090-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=robh@kernel.org \
--cc=tony@atomide.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
all inboxes | Powered by JetHome®