openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Uwe Kleine-König 2021-01-14 17:31:09 +01:00 committed by Russell King
parent a4b1b54810
commit 074a6bda18
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/common/sa1111.c
View File

@ -1368,11 +1368,11 @@ static int sa1111_bus_remove(struct device *dev)
{ {
struct sa1111_dev *sadev = to_sa1111_device(dev); struct sa1111_dev *sadev = to_sa1111_device(dev);
struct sa1111_driver *drv = SA1111_DRV(dev->driver); struct sa1111_driver *drv = SA1111_DRV(dev->driver);
int ret = 0;
if (drv->remove) if (drv->remove)
ret = drv->remove(sadev); drv->remove(sadev);
return ret;
return 0;
} }
struct bus_type sa1111_bus_type = { struct bus_type sa1111_bus_type = {

2
arch/arm/include/asm/hardware/sa1111.h
View File

@ -403,7 +403,7 @@ struct sa1111_driver {
struct device_driver drv; struct device_driver drv;
unsigned int devid; unsigned int devid;
int (*probe)(struct sa1111_dev *); 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) #define SA1111_DRV(_d) container_of((_d), struct sa1111_driver, drv)

4
drivers/input/serio/sa1111ps2.c
View File

@ -344,7 +344,7 @@ static int ps2_probe(struct sa1111_dev *dev)
/* /*
* Remove one device from this driver. * 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); struct ps2if *ps2if = sa1111_get_drvdata(dev);
@ -353,8 +353,6 @@ static int ps2_remove(struct sa1111_dev *dev)
sa1111_set_drvdata(dev, NULL); sa1111_set_drvdata(dev, NULL);
kfree(ps2if); kfree(ps2if);
return 0;
} }
/* /*

3
drivers/pcmcia/sa1111_generic.c
View File

@ -238,7 +238,7 @@ static int pcmcia_probe(struct sa1111_dev *dev)
return ret; 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); 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); release_mem_region(dev->res.start, 512);
sa1111_disable_device(dev); sa1111_disable_device(dev);
return 0;
} }
static struct sa1111_driver pcmcia_driver = { static struct sa1111_driver pcmcia_driver = {

4
drivers/usb/host/ohci-sa1111.c
View File

@ -236,7 +236,7 @@ static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev)
* Reverses the effect of ohci_hcd_sa1111_probe(), first invoking * Reverses the effect of ohci_hcd_sa1111_probe(), first invoking
* the HCD's stop() method. * 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); 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); sa1111_stop_hc(dev);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len); release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd); usb_put_hcd(hcd);
return 0;
} }
static void ohci_hcd_sa1111_shutdown(struct device *_dev) static void ohci_hcd_sa1111_shutdown(struct device *_dev)