]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: xilinx: xlnx_formatter_pcm: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 15 Mar 2023 15:07:41 +0000 (16:07 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Mar 2023 13:09:33 +0000 (13:09 +0000)
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-170-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/xilinx/xlnx_formatter_pcm.c

index ff1fe62fea7028eed06a96d22855bbce311917b1..299cfb5e202240a45b210e0c3278c598fc5e6d4a 100644 (file)
@@ -687,7 +687,7 @@ clk_err:
        return ret;
 }
 
-static int xlnx_formatter_pcm_remove(struct platform_device *pdev)
+static void xlnx_formatter_pcm_remove(struct platform_device *pdev)
 {
        int ret = 0;
        struct xlnx_pcm_drv_data *adata = dev_get_drvdata(&pdev->dev);
@@ -703,7 +703,6 @@ static int xlnx_formatter_pcm_remove(struct platform_device *pdev)
                dev_err(&pdev->dev, "audio formatter reset failed\n");
 
        clk_disable_unprepare(adata->axi_clk);
-       return 0;
 }
 
 static const struct of_device_id xlnx_formatter_pcm_of_match[] = {
@@ -714,7 +713,7 @@ MODULE_DEVICE_TABLE(of, xlnx_formatter_pcm_of_match);
 
 static struct platform_driver xlnx_formatter_pcm_driver = {
        .probe  = xlnx_formatter_pcm_probe,
-       .remove = xlnx_formatter_pcm_remove,
+       .remove_new = xlnx_formatter_pcm_remove,
        .driver = {
                .name   = DRV_NAME,
                .of_match_table = xlnx_formatter_pcm_of_match,