aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-21 08:50:12 -0500
committerTakashi Iwai <tiwai@suse.de>2012-11-21 09:06:13 -0500
commite15f1b43e1dbb24c91f1434700e4ba876f8e6734 (patch)
tree1d650968b821972740e5254e8d74305710741d4d /sound/pci/hda
parentefc2f8de1da8e140331cfdbfdc6e0d596c33fb40 (diff)
ALSA: hda - Remove shutup calls in free callbacks
The free callback is called at the state where no extra verbs are executed, thus calling *_shutup() is useless, as it's checking the shutdown flag. Remove such superfluous calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/patch_analog.c1
-rw-r--r--sound/pci/hda/patch_realtek.c1
-rw-r--r--sound/pci/hda/patch_sigmatel.c2
3 files changed, 0 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 1eeba7386666..eb5689df206a 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -636,7 +636,6 @@ static void ad198x_free(struct hda_codec *codec)
636 if (!spec) 636 if (!spec)
637 return; 637 return;
638 638
639 ad198x_shutup(codec);
640 ad198x_free_kctls(codec); 639 ad198x_free_kctls(codec);
641 kfree(spec); 640 kfree(spec);
642 snd_hda_detach_beep_device(codec); 641 snd_hda_detach_beep_device(codec);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4d2685269946..bde7d1b323cd 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2404,7 +2404,6 @@ static void alc_free(struct hda_codec *codec)
2404 if (!spec) 2404 if (!spec)
2405 return; 2405 return;
2406 2406
2407 alc_shutup(codec);
2408 alc_free_kctls(codec); 2407 alc_free_kctls(codec);
2409 alc_free_bind_ctls(codec); 2408 alc_free_bind_ctls(codec);
2410 snd_hda_gen_free(&spec->gen); 2409 snd_hda_gen_free(&spec->gen);
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index a6aeb6260719..1f6fd584e1c2 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4575,8 +4575,6 @@ static void stac92xx_free(struct hda_codec *codec)
4575 if (! spec) 4575 if (! spec)
4576 return; 4576 return;
4577 4577
4578 stac92xx_shutup(codec);
4579
4580 kfree(spec); 4578 kfree(spec);
4581 snd_hda_detach_beep_device(codec); 4579 snd_hda_detach_beep_device(codec);
4582} 4580}