Commit 7351324c authored by Dawei Li's avatar Dawei Li Committed by Takashi Iwai
Browse files

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

Signed-off-by: default avatarDawei Li <set_pte_at@outlook.com>
Link: https://lore.kernel.org/r/TYCP286MB2323A5AB1B2578EF4FA15DA7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM


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

drivers/mfd/wm97xx-core.c

+1 −3
Original line number Diff line number Diff line
@@ -319,13 +319,11 @@ static int wm97xx_ac97_probe(struct ac97_codec_device *adev) 
	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[] = {

include/sound/ac97/codec.h

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

};

sound/ac97/bus.c

+2 −3
Original line number Diff line number Diff line
@@ -524,9 +524,8 @@ 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);



	pm_runtime_disable(dev);