Commit 1c12c270 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

siox: Make remove callback return void 



The driver core ignores the return value of the remove callback, so
don't give siox drivers the chance to provide a value.

All siox drivers only allocate devm-managed resources in
.probe, so there is no .remove callback to fix.

Tested-by: default avatarThorsten Scherer <t.scherer@eckelmann.de>
Acked-by: default avatarThorsten Scherer <t.scherer@eckelmann.de>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20201125093106.240643-3-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07d9a767

drivers/siox/siox-core.c

+2 −3
Original line number Diff line number Diff line
@@ -525,12 +525,11 @@ static int siox_remove(struct device *dev) 
	struct siox_driver *sdriver =

		container_of(dev->driver, struct siox_driver, driver);

	struct siox_device *sdevice = to_siox_device(dev);

	int ret = 0;



	if (sdriver->remove)

		ret = sdriver->remove(sdevice);

		sdriver->remove(sdevice);



	return ret;

	return 0;

}



static void siox_shutdown(struct device *dev)

include/linux/siox.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ bool siox_device_connected(struct siox_device *sdevice); 


struct siox_driver {

	int (*probe)(struct siox_device *sdevice);

	int (*remove)(struct siox_device *sdevice);

	void (*remove)(struct siox_device *sdevice);

	void (*shutdown)(struct siox_device *sdevice);



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE