aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x/cs4231.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-01-26 07:51:48 +0100
committerTakashi Iwai <tiwai@suse.de>2021-01-26 07:51:48 +0100
commit4f2da3324eaff382ab1c6aaef8c10180b2f4d08c (patch)
tree38dab378ba4ad014d83151f020cc1e5979be0d6d /sound/isa/cs423x/cs4231.c
parentALSA: hda/tegra: Remove unnecessary null-check from hda_tegra_runtime_resume() (diff)
parentisa: Make the remove callback for isa drivers return void (diff)
downloadlinux-dev-4f2da3324eaff382ab1c6aaef8c10180b2f4d08c.tar.xz
linux-dev-4f2da3324eaff382ab1c6aaef8c10180b2f4d08c.zip
Merge tag 'tags/isa-void-remove-callback' into for-next
isa: Make the remove callback for isa drivers return void Link: https://lore.kernel.org/r/20210122092449.426097-1-uwe@kleine-koenig.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cs423x/cs4231.c')
-rw-r--r--sound/isa/cs423x/cs4231.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index bcbea6962d7e..c56cbc072918 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -135,10 +135,9 @@ out: snd_card_free(card);
return error;
}
-static int snd_cs4231_remove(struct device *dev, unsigned int n)
+static void snd_cs4231_remove(struct device *dev, unsigned int n)
{
snd_card_free(dev_get_drvdata(dev));
- return 0;
}
#ifdef CONFIG_PM