summaryrefslogtreecommitdiff
path: root/sound/ac97
diff options
context:
space:
mode:
authorDawei Li <set_pte_at@outlook.com>2023-01-06 18:13:49 +0300
committerTakashi Iwai <tiwai@suse.de>2023-01-25 11:34:20 +0300
commit7351324c6f486ae35865b430c8e30f07da9f378e (patch)
tree4b2071e1659befd4456ccca9c5874341788c9e39 /sound/ac97
parentbea11f0aa17a42303cfe9dae780bfc36f1947605 (diff)
downloadlinux-7351324c6f486ae35865b430c8e30f07da9f378e.tar.xz
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>
Diffstat (limited to 'sound/ac97')
-rw-r--r--sound/ac97/bus.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c
index 045330883a96..6067c04ce4c0 100644
--- 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);
}