summaryrefslogtreecommitdiff
path: root/drivers/tty/serdev/core.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2023-10-24 15:41:14 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-10-27 13:04:11 +0200
commitddab72ea7e5be7d1ae0433fa3d399e05837008d1 (patch)
treec1b9f4198669e6191512d4cf70c581a2f92995f4 /drivers/tty/serdev/core.c
parentaef0f5a1841e76fe13621edc7123076b38d458b0 (diff)
serdev: Simplify devm_serdev_device_open() function
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> Link: https://lore.kernel.org/r/20231024124115.3598090-3-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serdev/core.c')
-rw-r--r--drivers/tty/serdev/core.c18
1 files 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);