Message ID | 20230517230239.187727-87-u.kleine-koenig@pengutronix.de |
---|---|
State | Accepted |
Commit | b6b64b67c8ac08f370338cd1f8e807487043a400 |
Headers | show |
Series | usb: Convert to platform remove callback returning void | expand |
On 18.05.2023 01:02, 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 ignored (apart from > emitting a warning) 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. Eventually after all drivers are converted, .remove_new() is > renamed to .remove(). > > 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: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/usb/misc/qcom_eud.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/misc/qcom_eud.c b/drivers/usb/misc/qcom_eud.c > index b7f13df00764..0dc414463759 100644 > --- a/drivers/usb/misc/qcom_eud.c > +++ b/drivers/usb/misc/qcom_eud.c > @@ -217,7 +217,7 @@ static int eud_probe(struct platform_device *pdev) > return 0; > } > > -static int eud_remove(struct platform_device *pdev) > +static void eud_remove(struct platform_device *pdev) > { > struct eud_chip *chip = platform_get_drvdata(pdev); > > @@ -226,8 +226,6 @@ static int eud_remove(struct platform_device *pdev) > > device_init_wakeup(&pdev->dev, false); > disable_irq_wake(chip->irq); > - > - return 0; > } > > static const struct of_device_id eud_dt_match[] = { > @@ -238,7 +236,7 @@ MODULE_DEVICE_TABLE(of, eud_dt_match); > > static struct platform_driver eud_driver = { > .probe = eud_probe, > - .remove = eud_remove, > + .remove_new = eud_remove, > .driver = { > .name = "qcom_eud", > .dev_groups = eud_groups,
diff --git a/drivers/usb/misc/qcom_eud.c b/drivers/usb/misc/qcom_eud.c index b7f13df00764..0dc414463759 100644 --- a/drivers/usb/misc/qcom_eud.c +++ b/drivers/usb/misc/qcom_eud.c @@ -217,7 +217,7 @@ static int eud_probe(struct platform_device *pdev) return 0; } -static int eud_remove(struct platform_device *pdev) +static void eud_remove(struct platform_device *pdev) { struct eud_chip *chip = platform_get_drvdata(pdev); @@ -226,8 +226,6 @@ static int eud_remove(struct platform_device *pdev) device_init_wakeup(&pdev->dev, false); disable_irq_wake(chip->irq); - - return 0; } static const struct of_device_id eud_dt_match[] = { @@ -238,7 +236,7 @@ MODULE_DEVICE_TABLE(of, eud_dt_match); static struct platform_driver eud_driver = { .probe = eud_probe, - .remove = eud_remove, + .remove_new = eud_remove, .driver = { .name = "qcom_eud", .dev_groups = eud_groups,
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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). 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/usb/misc/qcom_eud.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)