| Message ID | 20230326143224.572654-6-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | media: Convert to platform remove callback returning void | expand |
On Sun, Mar 26, 2023 at 7:32 AM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 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> Reviewed-by: Guenter Roeck <groeck@chromium.org> > --- > drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c > index 960432230bbf..3d2600af9fc1 100644 > --- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c > +++ b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c > @@ -326,7 +326,7 @@ static int cros_ec_cec_probe(struct platform_device *pdev) > return ret; > } > > -static int cros_ec_cec_remove(struct platform_device *pdev) > +static void cros_ec_cec_remove(struct platform_device *pdev) > { > struct cros_ec_cec *cros_ec_cec = platform_get_drvdata(pdev); > struct device *dev = &pdev->dev; > @@ -346,13 +346,11 @@ static int cros_ec_cec_remove(struct platform_device *pdev) > cec_notifier_cec_adap_unregister(cros_ec_cec->notify, > cros_ec_cec->adap); > cec_unregister_adapter(cros_ec_cec->adap); > - > - return 0; > } > > static struct platform_driver cros_ec_cec_driver = { > .probe = cros_ec_cec_probe, > - .remove = cros_ec_cec_remove, > + .remove_new = cros_ec_cec_remove, > .driver = { > .name = DRV_NAME, > .pm = &cros_ec_cec_pm_ops, > -- > 2.39.2 >
diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c index 960432230bbf..3d2600af9fc1 100644 --- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c +++ b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c @@ -326,7 +326,7 @@ static int cros_ec_cec_probe(struct platform_device *pdev) return ret; } -static int cros_ec_cec_remove(struct platform_device *pdev) +static void cros_ec_cec_remove(struct platform_device *pdev) { struct cros_ec_cec *cros_ec_cec = platform_get_drvdata(pdev); struct device *dev = &pdev->dev; @@ -346,13 +346,11 @@ static int cros_ec_cec_remove(struct platform_device *pdev) cec_notifier_cec_adap_unregister(cros_ec_cec->notify, cros_ec_cec->adap); cec_unregister_adapter(cros_ec_cec->adap); - - return 0; } static struct platform_driver cros_ec_cec_driver = { .probe = cros_ec_cec_probe, - .remove = cros_ec_cec_remove, + .remove_new = cros_ec_cec_remove, .driver = { .name = DRV_NAME, .pm = &cros_ec_cec_pm_ops,
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/media/cec/platform/cros-ec/cros-ec-cec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)