| Message ID | 20230508205306.1474415-33-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | i2c: Convert to platform remove callback returning void | expand |
On Mon, 08 May 2023 22:52:09 +0200, 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> > --- > drivers/i2c/busses/i2c-isch.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c > index 2dc7ada06ac5..1dc1ceaa4443 100644 > --- a/drivers/i2c/busses/i2c-isch.c > +++ b/drivers/i2c/busses/i2c-isch.c > @@ -286,14 +286,12 @@ static int smbus_sch_probe(struct platform_device *dev) > return retval; > } > > -static int smbus_sch_remove(struct platform_device *pdev) > +static void smbus_sch_remove(struct platform_device *pdev) > { > if (sch_smba) { > i2c_del_adapter(&sch_adapter); > sch_smba = 0; > } > - > - return 0; > } > > static struct platform_driver smbus_sch_driver = { > @@ -301,7 +299,7 @@ static struct platform_driver smbus_sch_driver = { > .name = "isch_smbus", > }, > .probe = smbus_sch_probe, > - .remove = smbus_sch_remove, > + .remove_new = smbus_sch_remove, > }; > > module_platform_driver(smbus_sch_driver); Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index 2dc7ada06ac5..1dc1ceaa4443 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c @@ -286,14 +286,12 @@ static int smbus_sch_probe(struct platform_device *dev) return retval; } -static int smbus_sch_remove(struct platform_device *pdev) +static void smbus_sch_remove(struct platform_device *pdev) { if (sch_smba) { i2c_del_adapter(&sch_adapter); sch_smba = 0; } - - return 0; } static struct platform_driver smbus_sch_driver = { @@ -301,7 +299,7 @@ static struct platform_driver smbus_sch_driver = { .name = "isch_smbus", }, .probe = smbus_sch_probe, - .remove = smbus_sch_remove, + .remove_new = smbus_sch_remove, }; module_platform_driver(smbus_sch_driver);
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/i2c/busses/i2c-isch.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)