[PATCH 6/6] soundbus: make remove callback of soundbus driver void returned
From: Dawei Li <hidden>
Date: 2022-12-05 15:38:00
Also in:
alsa-devel, linux-hyperv, lkml, xen-devel
Subsystem:
aoa (apple onboard audio) alsa driver, sound, the rest · Maintainers:
Johannes Berg, Jaroslav Kysela, Takashi Iwai, Linus Torvalds
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.
This change is for soundbus based drivers.
Signed-off-by: Dawei Li <redacted>
---
sound/aoa/fabrics/layout.c | 3 +--
sound/aoa/soundbus/soundbus.h | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index ec4ef18555bc..850dc8c53e9b 100644
--- 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 3a99c1f1a3ca..230dfa1ba270 100644
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h@@ -184,10 +184,10 @@ struct soundbus_driver { /* we don't implement any matching at all */ - int (*probe)(struct soundbus_dev* dev); - int (*remove)(struct soundbus_dev* dev); + int (*probe)(struct soundbus_dev *dev); + void (*remove)(struct soundbus_dev *dev); - int (*shutdown)(struct soundbus_dev* dev); + int (*shutdown)(struct soundbus_dev *dev); struct device_driver driver; };
--
2.25.1