Commit 074a6bda authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Russell King
Browse files

ARM: 9048/1: sa1111: make sa1111 bus's remove callback return void 

The driver core ignores the return value of struct device_driver::remove
because there is only little that can be done. To simplify the quest to
make this function return void, let struct sa1111_driver::remove return
void, too. All users already unconditionally return 0, this commit makes
it obvious that returning an error code is a bad idea and ensures future
users behave accordingly.

Link: https://lore.kernel.org/r/20201126114724.2028511-1-u.kleine-koenig@pengutronix.de


Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent a4b1b548

arch/arm/common/sa1111.c

+3 −3
Original line number Diff line number Diff line
@@ -1368,11 +1368,11 @@ static int sa1111_bus_remove(struct device *dev) 
{

	struct sa1111_dev *sadev = to_sa1111_device(dev);

	struct sa1111_driver *drv = SA1111_DRV(dev->driver);

	int ret = 0;



	if (drv->remove)

		ret = drv->remove(sadev);

	return ret;

		drv->remove(sadev);



	return 0;

}



struct bus_type sa1111_bus_type = {

arch/arm/include/asm/hardware/sa1111.h

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ struct sa1111_driver { 
	struct device_driver	drv;

	unsigned int		devid;

	int (*probe)(struct sa1111_dev *);

	int (*remove)(struct sa1111_dev *);

	void (*remove)(struct sa1111_dev *);

};



#define SA1111_DRV(_d)	container_of((_d), struct sa1111_driver, drv)

drivers/input/serio/sa1111ps2.c

+1 −3
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int ps2_probe(struct sa1111_dev *dev) 
/*

 * Remove one device from this driver.

 */

static int ps2_remove(struct sa1111_dev *dev)

static void ps2_remove(struct sa1111_dev *dev)

{

	struct ps2if *ps2if = sa1111_get_drvdata(dev);
@@ -353,8 +353,6 @@ static int ps2_remove(struct sa1111_dev *dev) 
	sa1111_set_drvdata(dev, NULL);



	kfree(ps2if);



	return 0;

}



/*

drivers/pcmcia/sa1111_generic.c

+1 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) 
	return ret;

}



static int pcmcia_remove(struct sa1111_dev *dev)

static void pcmcia_remove(struct sa1111_dev *dev)

{

	struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
@@ -252,7 +252,6 @@ static int pcmcia_remove(struct sa1111_dev *dev) 


	release_mem_region(dev->res.start, 512);

	sa1111_disable_device(dev);

	return 0;

}



static struct sa1111_driver pcmcia_driver = {

drivers/usb/host/ohci-sa1111.c

+1 −3
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev) 
 * Reverses the effect of ohci_hcd_sa1111_probe(), first invoking

 * the HCD's stop() method.

 */

static int ohci_hcd_sa1111_remove(struct sa1111_dev *dev)

static void ohci_hcd_sa1111_remove(struct sa1111_dev *dev)

{

	struct usb_hcd *hcd = sa1111_get_drvdata(dev);
@@ -244,8 +244,6 @@ static int ohci_hcd_sa1111_remove(struct sa1111_dev *dev) 
	sa1111_stop_hc(dev);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	usb_put_hcd(hcd);



	return 0;

}



static void ohci_hcd_sa1111_shutdown(struct device *_dev)