ALSA: ac97: make remove callback of ac97 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 ac97 based drivers to return
void.

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

diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c
index 9a2331eb1bfa606426145119cd79596cdbb8da42..663acbb1854c93cf8921561767f3ece1cea2f3cb 100644 (file)
--- a/drivers/mfd/wm97xx-core.c
+++ b/drivers/mfd/wm97xx-core.c
@@ -319,13 +319,11 @@ err_free_compat:
        return ret;
 }
 
-static int wm97xx_ac97_remove(struct ac97_codec_device *adev)
+static void wm97xx_ac97_remove(struct ac97_codec_device *adev)
 {
        struct wm97xx_priv *wm97xx = ac97_get_drvdata(adev);
 
        snd_ac97_compat_release(wm97xx->ac97);
-
-       return 0;
 }
 
 static const struct ac97_id wm97xx_ac97_ids[] = {

diff --git a/include/sound/ac97/codec.h b/include/sound/ac97/codec.h
index 9792d25fa36928b8470bfd6891dbb98ebf401733..2fc641cb198266a3297955588b850238273e2671 100644 (file)
--- a/include/sound/ac97/codec.h
+++ b/include/sound/ac97/codec.h
@@ -63,7 +63,7 @@ struct ac97_codec_device {
 struct ac97_codec_driver {
        struct device_driver    driver;
        int                     (*probe)(struct ac97_codec_device *);
-       int                     (*remove)(struct ac97_codec_device *);
+       void                    (*remove)(struct ac97_codec_device *dev);
        void                    (*shutdown)(struct ac97_codec_device *);
        const struct ac97_id    *id_table;
 };

diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c
index 045330883a9633f5a52b82be9304c15420ded684..6067c04ce4c0a88bb05e61b235a4f5a26e12a16a 100644 (file)
--- a/sound/ac97/bus.c
+++ b/sound/ac97/bus.c
@@ -524,10 +524,9 @@ static void ac97_bus_remove(struct device *dev)
        if (ret < 0)
                return;
 
-       ret = adrv->remove(adev);
+       adrv->remove(adev);
        pm_runtime_put_noidle(dev);
-       if (ret == 0)
-               ac97_put_disable_clk(adev);
+       ac97_put_disable_clk(adev);
 
        pm_runtime_disable(dev);
 }