summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/bus.c
diff options
context:
space:
mode:
authorUwe Kleine-König <uwe@kleine-koenig.org>2021-02-08 08:37:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-09 09:30:16 +0100
commitbf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b (patch)
tree119fb30a4d3960bd6198ab8dbfa0027d8e2dd882 /drivers/misc/mei/bus.c
parentf320ff0387a8a2d3123c4f7d6d61eecc740d0466 (diff)
downloadlinux-stable-bf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b.tar.gz
linux-stable-bf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b.tar.bz2
linux-stable-bf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b.zip
mei: bus: change remove callback to return void
The driver core ignores the return value of mei_cl_device_remove() so passing an error value doesn't solve any problem. As most mei drivers' remove callbacks return 0 unconditionally and returning a different value doesn't have any effect, change this prototype to return void and return 0 unconditionally in mei_cl_device_remove(). The only driver that could return an error value is modified to emit an explicit warning in the error case. Acked-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Link: https://lore.kernel.org/r/20210208073705.428185-3-uwe@kleine-koenig.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/bus.c')
-rw-r--r--drivers/misc/mei/bus.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 393a41330a6b..580074e32599 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -881,17 +881,16 @@ static int mei_cl_device_remove(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
struct mei_cl_driver *cldrv = to_mei_cl_driver(dev->driver);
- int ret = 0;
if (cldrv->remove)
- ret = cldrv->remove(cldev);
+ cldrv->remove(cldev);
mei_cldev_unregister_callbacks(cldev);
mei_cl_bus_module_put(cldev);
module_put(THIS_MODULE);
- return ret;
+ return 0;
}
static ssize_t name_show(struct device *dev, struct device_attribute *a,