ALSA: aoa: make remove callback of soundbus driver void returned

Since commit fc7a6209d571 ("bus: Make remove callback return void")
forces bus_type::remove be void-returned, it doesn't make much sense
for any bus based driver implementing remove callbalk to return
non-void to its caller.

As such, change the remove function for soundbus based drivers to
return void.

Signed-off-by: Dawei Li <set_pte_at@outlook.com>
Link: https://lore.kernel.org/r/TYCP286MB23234FED40A3AE6797DEBAB7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index ec4ef18555bc90b6aade3050ea97a9438e37a425..850dc8c53e9b55f35c1e5c0cc68fa4a63524ed5e 100644 (file)
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -1094,7 +1094,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
        return -ENODEV;
 }
 
-static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
+static void aoa_fabric_layout_remove(struct soundbus_dev *sdev)
 {
        struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);
        int i;
@@ -1123,7 +1123,6 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
        kfree(ldev);
        sdev->pcmid = -1;
        sdev->pcmname = NULL;
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP

diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h
index 3a99c1f1a3cab087546ba5e844de34a0dc3158d9..db40f9d042b4ad1a22f14edd535e0682f8907ad1 100644 (file)
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h
@@ -185,7 +185,7 @@ struct soundbus_driver {
        /* we don't implement any matching at all */
 
        int     (*probe)(struct soundbus_dev* dev);
-       int     (*remove)(struct soundbus_dev* dev);
+       void    (*remove)(struct soundbus_dev *dev);
 
        int     (*shutdown)(struct soundbus_dev* dev);