| Message ID | 20230508205306.1474415-15-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: Convert to platform remove callback returning void | expand |
Acked-by: Jochen Friedrich <jochen@scram.de> Am 08.05.2023 um 22:51 schrieb Uwe Kleine-König: > 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-cpm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c > index 24d584a1c9a7..732daf6a932b 100644 > --- a/drivers/i2c/busses/i2c-cpm.c > +++ b/drivers/i2c/busses/i2c-cpm.c > @@ -676,7 +676,7 @@ static int cpm_i2c_probe(struct platform_device *ofdev) > return result; > } > > -static int cpm_i2c_remove(struct platform_device *ofdev) > +static void cpm_i2c_remove(struct platform_device *ofdev) > { > struct cpm_i2c *cpm = platform_get_drvdata(ofdev); > > @@ -685,8 +685,6 @@ static int cpm_i2c_remove(struct platform_device *ofdev) > cpm_i2c_shutdown(cpm); > > kfree(cpm); > - > - return 0; > } > > static const struct of_device_id cpm_i2c_match[] = { > @@ -703,7 +701,7 @@ MODULE_DEVICE_TABLE(of, cpm_i2c_match); > > static struct platform_driver cpm_i2c_driver = { > .probe = cpm_i2c_probe, > - .remove = cpm_i2c_remove, > + .remove_new = cpm_i2c_remove, > .driver = { > .name = "fsl-i2c-cpm", > .of_match_table = cpm_i2c_match,
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 24d584a1c9a7..732daf6a932b 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -676,7 +676,7 @@ static int cpm_i2c_probe(struct platform_device *ofdev) return result; } -static int cpm_i2c_remove(struct platform_device *ofdev) +static void cpm_i2c_remove(struct platform_device *ofdev) { struct cpm_i2c *cpm = platform_get_drvdata(ofdev); @@ -685,8 +685,6 @@ static int cpm_i2c_remove(struct platform_device *ofdev) cpm_i2c_shutdown(cpm); kfree(cpm); - - return 0; } static const struct of_device_id cpm_i2c_match[] = { @@ -703,7 +701,7 @@ MODULE_DEVICE_TABLE(of, cpm_i2c_match); static struct platform_driver cpm_i2c_driver = { .probe = cpm_i2c_probe, - .remove = cpm_i2c_remove, + .remove_new = cpm_i2c_remove, .driver = { .name = "fsl-i2c-cpm", .of_match_table = cpm_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-cpm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)