mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 13:41:55 +00:00
usb: ohci-platform: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Link: https://lore.kernel.org/r/20230517230239.187727-70-u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e399d0147f
commit
18b93fc987
@ -239,7 +239,7 @@ err_put_clks:
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ohci_platform_remove(struct platform_device *dev)
|
static void ohci_platform_remove(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
struct usb_hcd *hcd = platform_get_drvdata(dev);
|
struct usb_hcd *hcd = platform_get_drvdata(dev);
|
||||||
struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
|
struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
|
||||||
@ -264,8 +264,6 @@ static int ohci_platform_remove(struct platform_device *dev)
|
|||||||
|
|
||||||
if (pdata == &ohci_platform_defaults)
|
if (pdata == &ohci_platform_defaults)
|
||||||
dev->dev.platform_data = NULL;
|
dev->dev.platform_data = NULL;
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
@ -347,7 +345,7 @@ static const struct dev_pm_ops ohci_platform_pm_ops = {
|
|||||||
static struct platform_driver ohci_platform_driver = {
|
static struct platform_driver ohci_platform_driver = {
|
||||||
.id_table = ohci_platform_table,
|
.id_table = ohci_platform_table,
|
||||||
.probe = ohci_platform_probe,
|
.probe = ohci_platform_probe,
|
||||||
.remove = ohci_platform_remove,
|
.remove_new = ohci_platform_remove,
|
||||||
.shutdown = usb_hcd_platform_shutdown,
|
.shutdown = usb_hcd_platform_shutdown,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "ohci-platform",
|
.name = "ohci-platform",
|
||||||
|
Loading…
Reference in New Issue
Block a user