| Message ID | 20230302144732.1903781-11-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86: Convert to platform remove callback returning void | expand |
On Thursday 02 March 2023 15:47:13 Uwe Kleine-König wrote: > 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 (mostly) ignored > 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. > > 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> Acked-by: Pali Rohár <pali@kernel.org> > --- > drivers/platform/x86/dell/dell-smo8800.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/dell/dell-smo8800.c b/drivers/platform/x86/dell/dell-smo8800.c > index 8d6b7a83cf24..f7ec17c56833 100644 > --- a/drivers/platform/x86/dell/dell-smo8800.c > +++ b/drivers/platform/x86/dell/dell-smo8800.c > @@ -154,14 +154,13 @@ static int smo8800_probe(struct platform_device *device) > return err; > } > > -static int smo8800_remove(struct platform_device *device) > +static void smo8800_remove(struct platform_device *device) > { > struct smo8800_device *smo8800 = platform_get_drvdata(device); > > free_irq(smo8800->irq, smo8800); > misc_deregister(&smo8800->miscdev); > dev_dbg(&device->dev, "device /dev/freefall unregistered\n"); > - return 0; > } > > /* NOTE: Keep this list in sync with drivers/i2c/busses/i2c-i801.c */ > @@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(acpi, smo8800_ids); > > static struct platform_driver smo8800_driver = { > .probe = smo8800_probe, > - .remove = smo8800_remove, > + .remove_new = smo8800_remove, > .driver = { > .name = DRIVER_NAME, > .acpi_match_table = smo8800_ids, > -- > 2.39.1 >
diff --git a/drivers/platform/x86/dell/dell-smo8800.c b/drivers/platform/x86/dell/dell-smo8800.c index 8d6b7a83cf24..f7ec17c56833 100644 --- a/drivers/platform/x86/dell/dell-smo8800.c +++ b/drivers/platform/x86/dell/dell-smo8800.c @@ -154,14 +154,13 @@ static int smo8800_probe(struct platform_device *device) return err; } -static int smo8800_remove(struct platform_device *device) +static void smo8800_remove(struct platform_device *device) { struct smo8800_device *smo8800 = platform_get_drvdata(device); free_irq(smo8800->irq, smo8800); misc_deregister(&smo8800->miscdev); dev_dbg(&device->dev, "device /dev/freefall unregistered\n"); - return 0; } /* NOTE: Keep this list in sync with drivers/i2c/busses/i2c-i801.c */ @@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(acpi, smo8800_ids); static struct platform_driver smo8800_driver = { .probe = smo8800_probe, - .remove = smo8800_remove, + .remove_new = smo8800_remove, .driver = { .name = DRIVER_NAME, .acpi_match_table = smo8800_ids,
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 (mostly) ignored 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. 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> --- drivers/platform/x86/dell/dell-smo8800.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)