| Message ID | 20230326143224.572654-53-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4a70c1aafbcae54057f65dd382b7d244849f1e69 |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: Convert to platform remove callback returning void | expand |
On Sun, Mar 26, 2023 at 4:34 PM 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: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
On 2023-03-26 16:31:17 +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> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/platform/renesas/rcar-vin/rcar-csi2.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c > index 174aa6176f54..1632c9a53ac4 100644 > --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c > +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c > @@ -1574,7 +1574,7 @@ static int rcsi2_probe(struct platform_device *pdev) > return ret; > } > > -static int rcsi2_remove(struct platform_device *pdev) > +static void rcsi2_remove(struct platform_device *pdev) > { > struct rcar_csi2 *priv = platform_get_drvdata(pdev); > > @@ -1585,12 +1585,10 @@ static int rcsi2_remove(struct platform_device *pdev) > pm_runtime_disable(&pdev->dev); > > mutex_destroy(&priv->lock); > - > - return 0; > } > > static struct platform_driver rcar_csi2_pdrv = { > - .remove = rcsi2_remove, > + .remove_new = rcsi2_remove, > .probe = rcsi2_probe, > .driver = { > .name = "rcar-csi2", > -- > 2.39.2 >
diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c index 174aa6176f54..1632c9a53ac4 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c @@ -1574,7 +1574,7 @@ static int rcsi2_probe(struct platform_device *pdev) return ret; } -static int rcsi2_remove(struct platform_device *pdev) +static void rcsi2_remove(struct platform_device *pdev) { struct rcar_csi2 *priv = platform_get_drvdata(pdev); @@ -1585,12 +1585,10 @@ static int rcsi2_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); mutex_destroy(&priv->lock); - - return 0; } static struct platform_driver rcar_csi2_pdrv = { - .remove = rcsi2_remove, + .remove_new = rcsi2_remove, .probe = rcsi2_probe, .driver = { .name = "rcar-csi2",
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/platform/renesas/rcar-vin/rcar-csi2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)