| Message ID | 20230315150745.67084-31-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On 15.03.2023 17:05, Uwe Kleine-König wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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: Claudiu Beznea <claudiu.beznea@microchip.com> > --- > sound/soc/atmel/mikroe-proto.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c > index 954460719aa3..30c87c2c1b0b 100644 > --- a/sound/soc/atmel/mikroe-proto.c > +++ b/sound/soc/atmel/mikroe-proto.c > @@ -155,11 +155,9 @@ static int snd_proto_probe(struct platform_device *pdev) > return ret; > } > > -static int snd_proto_remove(struct platform_device *pdev) > +static void snd_proto_remove(struct platform_device *pdev) > { > snd_soc_unregister_card(&snd_proto); > - > - return 0; > } > > static const struct of_device_id snd_proto_of_match[] = { > @@ -174,7 +172,7 @@ static struct platform_driver snd_proto_driver = { > .of_match_table = snd_proto_of_match, > }, > .probe = snd_proto_probe, > - .remove = snd_proto_remove, > + .remove_new = snd_proto_remove, > }; > > module_platform_driver(snd_proto_driver); > -- > 2.39.2 >
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index 954460719aa3..30c87c2c1b0b 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -155,11 +155,9 @@ static int snd_proto_probe(struct platform_device *pdev) return ret; } -static int snd_proto_remove(struct platform_device *pdev) +static void snd_proto_remove(struct platform_device *pdev) { snd_soc_unregister_card(&snd_proto); - - return 0; } static const struct of_device_id snd_proto_of_match[] = { @@ -174,7 +172,7 @@ static struct platform_driver snd_proto_driver = { .of_match_table = snd_proto_of_match, }, .probe = snd_proto_probe, - .remove = snd_proto_remove, + .remove_new = snd_proto_remove, }; module_platform_driver(snd_proto_driver);
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> --- sound/soc/atmel/mikroe-proto.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)