Commit 47c59e0c authored by Dawei Li's avatar Dawei Li Committed by Takashi Iwai
Browse files

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



Since commit fc7a6209 ("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: default avatarDawei Li <set_pte_at@outlook.com>
Link: https://lore.kernel.org/r/TYCP286MB23234FED40A3AE6797DEBAB7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7351324c

sound/aoa/fabrics/layout.c

+1 −2
Original line number Diff line number Diff line
@@ -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

sound/aoa/soundbus/soundbus.h

+1 −1
Original line number Diff line number Diff line
@@ -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);