mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
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>
This commit is contained in:
parent
aef0f5a184
commit
ddab72ea7e
1 changed files with 4 additions and 14 deletions
|
@ -187,30 +187,20 @@ void serdev_device_close(struct serdev_device *serdev)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(serdev_device_close);
|
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)
|
int devm_serdev_device_open(struct device *dev, struct serdev_device *serdev)
|
||||||
{
|
{
|
||||||
struct serdev_device **dr;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
dr = devres_alloc(devm_serdev_device_release, sizeof(*dr), GFP_KERNEL);
|
|
||||||
if (!dr)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
ret = serdev_device_open(serdev);
|
ret = serdev_device_open(serdev);
|
||||||
if (ret) {
|
if (ret)
|
||||||
devres_free(dr);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
|
|
||||||
*dr = serdev;
|
return devm_add_action_or_reset(dev, devm_serdev_device_close, serdev);
|
||||||
devres_add(dev, dr);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(devm_serdev_device_open);
|
EXPORT_SYMBOL_GPL(devm_serdev_device_open);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue