| Message ID | 20230508205306.1474415-20-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: Convert to platform remove callback returning void | expand |
Hi Uwe, On Mon, May 08 2023, 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: Baruch Siach <baruch@tkos.co.il> Thanks, baruch > drivers/i2c/busses/i2c-digicolor.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c > index 50925d97fa42..3462f2bc0fa8 100644 > --- a/drivers/i2c/busses/i2c-digicolor.c > +++ b/drivers/i2c/busses/i2c-digicolor.c > @@ -347,14 +347,12 @@ static int dc_i2c_probe(struct platform_device *pdev) > return 0; > } > > -static int dc_i2c_remove(struct platform_device *pdev) > +static void dc_i2c_remove(struct platform_device *pdev) > { > struct dc_i2c *i2c = platform_get_drvdata(pdev); > > i2c_del_adapter(&i2c->adap); > clk_disable_unprepare(i2c->clk); > - > - return 0; > } > > static const struct of_device_id dc_i2c_match[] = { > @@ -365,7 +363,7 @@ MODULE_DEVICE_TABLE(of, dc_i2c_match); > > static struct platform_driver dc_i2c_driver = { > .probe = dc_i2c_probe, > - .remove = dc_i2c_remove, > + .remove_new = dc_i2c_remove, > .driver = { > .name = "digicolor-i2c", > .of_match_table = dc_i2c_match,
diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c index 50925d97fa42..3462f2bc0fa8 100644 --- a/drivers/i2c/busses/i2c-digicolor.c +++ b/drivers/i2c/busses/i2c-digicolor.c @@ -347,14 +347,12 @@ static int dc_i2c_probe(struct platform_device *pdev) return 0; } -static int dc_i2c_remove(struct platform_device *pdev) +static void dc_i2c_remove(struct platform_device *pdev) { struct dc_i2c *i2c = platform_get_drvdata(pdev); i2c_del_adapter(&i2c->adap); clk_disable_unprepare(i2c->clk); - - return 0; } static const struct of_device_id dc_i2c_match[] = { @@ -365,7 +363,7 @@ MODULE_DEVICE_TABLE(of, dc_i2c_match); static struct platform_driver dc_i2c_driver = { .probe = dc_i2c_probe, - .remove = dc_i2c_remove, + .remove_new = dc_i2c_remove, .driver = { .name = "digicolor-i2c", .of_match_table = dc_i2c_match,
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-digicolor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)