]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dmaengine: sh: usb-dmac: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 19 Sep 2023 13:31:50 +0000 (15:31 +0200)
committerVinod Koul <vkoul@kernel.org>
Thu, 28 Sep 2023 07:40:55 +0000 (13:10 +0530)
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>
Link: https://lore.kernel.org/r/20230919133207.1400430-43-u.kleine-koenig@pengutronix.de
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/sh/usb-dmac.c

index b14cf350b669aa7d911b20b00bba63b2ee12b16b..d8c93faa424d76f3b43dff75ccdbdd869642cf88 100644 (file)
@@ -866,7 +866,7 @@ static void usb_dmac_chan_remove(struct usb_dmac *dmac,
        devm_free_irq(dmac->dev, uchan->irq, uchan);
 }
 
-static int usb_dmac_remove(struct platform_device *pdev)
+static void usb_dmac_remove(struct platform_device *pdev)
 {
        struct usb_dmac *dmac = platform_get_drvdata(pdev);
        int i;
@@ -877,8 +877,6 @@ static int usb_dmac_remove(struct platform_device *pdev)
        dma_async_device_unregister(&dmac->engine);
 
        pm_runtime_disable(&pdev->dev);
-
-       return 0;
 }
 
 static void usb_dmac_shutdown(struct platform_device *pdev)
@@ -901,7 +899,7 @@ static struct platform_driver usb_dmac_driver = {
                .of_match_table = usb_dmac_of_ids,
        },
        .probe          = usb_dmac_probe,
-       .remove         = usb_dmac_remove,
+       .remove_new     = usb_dmac_remove,
        .shutdown       = usb_dmac_shutdown,
 };