Skip to content

Commit

Permalink
ALSA: sparc/dbri: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20230315150745.67084-174-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Mark Brown committed Mar 20, 2023
1 parent 44e4b6e commit 9fa6137
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/sparc/dbri.c
Original file line number Diff line number Diff line change
Expand Up @@ -2656,14 +2656,12 @@ static int dbri_probe(struct platform_device *op)
return err;
}

static int dbri_remove(struct platform_device *op)
static void dbri_remove(struct platform_device *op)
{
struct snd_card *card = dev_get_drvdata(&op->dev);

snd_dbri_free(card->private_data);
snd_card_free(card);

return 0;
}

static const struct of_device_id dbri_match[] = {
Expand All @@ -2684,7 +2682,7 @@ static struct platform_driver dbri_sbus_driver = {
.of_match_table = dbri_match,
},
.probe = dbri_probe,
.remove = dbri_remove,
.remove_new = dbri_remove,
};

module_platform_driver(dbri_sbus_driver);

0 comments on commit 9fa6137

Please sign in to comment.