Skip to content

Commit 47c59e0

Browse files
Dawei Litiwai
authored andcommitted
ALSA: aoa: make remove callback of soundbus driver void returned
Since commit fc7a620 ("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 <[email protected]> Link: https://lore.kernel.org/r/TYCP286MB23234FED40A3AE6797DEBAB7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM Signed-off-by: Takashi Iwai <[email protected]>
1 parent 7351324 commit 47c59e0

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

sound/aoa/fabrics/layout.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
10941094
return -ENODEV;
10951095
}
10961096

1097-
static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
1097+
static void aoa_fabric_layout_remove(struct soundbus_dev *sdev)
10981098
{
10991099
struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);
11001100
int i;
@@ -1123,7 +1123,6 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
11231123
kfree(ldev);
11241124
sdev->pcmid = -1;
11251125
sdev->pcmname = NULL;
1126-
return 0;
11271126
}
11281127

11291128
#ifdef CONFIG_PM_SLEEP

sound/aoa/soundbus/soundbus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ struct soundbus_driver {
185185
/* we don't implement any matching at all */
186186

187187
int (*probe)(struct soundbus_dev* dev);
188-
int (*remove)(struct soundbus_dev* dev);
188+
void (*remove)(struct soundbus_dev *dev);
189189

190190
int (*shutdown)(struct soundbus_dev* dev);
191191

0 commit comments

Comments
 (0)