aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-06-12 11:43:36 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-13 10:48:38 -0400
commit149b154452b18dedd4559cdd65b965ae9011e425 (patch)
tree11f4c5bfc0680907de0a3ad13b2c89b45ae11a82 /sound
parent4549915cdf468019d2fd86485dd8d2ab426b8d85 (diff)
ALSA: hda - Remove unused mutex
Removed unused mutex from patch_*.c. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_analog.c5
-rw-r--r--sound/pci/hda/patch_conexant.c4
2 files changed, 0 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index a99e86d74278..55ce897ef0b3 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -23,7 +23,6 @@
23#include <linux/delay.h> 23#include <linux/delay.h>
24#include <linux/slab.h> 24#include <linux/slab.h>
25#include <linux/pci.h> 25#include <linux/pci.h>
26#include <linux/mutex.h>
27 26
28#include <sound/core.h> 27#include <sound/core.h>
29#include "hda_codec.h" 28#include "hda_codec.h"
@@ -64,7 +63,6 @@ struct ad198x_spec {
64 /* PCM information */ 63 /* PCM information */
65 struct hda_pcm pcm_rec[3]; /* used in alc_build_pcms() */ 64 struct hda_pcm pcm_rec[3]; /* used in alc_build_pcms() */
66 65
67 struct mutex amp_mutex; /* PCM volume/mute control mutex */
68 unsigned int spdif_route; 66 unsigned int spdif_route;
69 67
70 /* dynamic controls, init_verbs and input_mux */ 68 /* dynamic controls, init_verbs and input_mux */
@@ -3177,7 +3175,6 @@ static int patch_ad1884(struct hda_codec *codec)
3177 if (spec == NULL) 3175 if (spec == NULL)
3178 return -ENOMEM; 3176 return -ENOMEM;
3179 3177
3180 mutex_init(&spec->amp_mutex);
3181 codec->spec = spec; 3178 codec->spec = spec;
3182 3179
3183 spec->multiout.max_channels = 2; 3180 spec->multiout.max_channels = 2;
@@ -3847,7 +3844,6 @@ static int patch_ad1884a(struct hda_codec *codec)
3847 if (spec == NULL) 3844 if (spec == NULL)
3848 return -ENOMEM; 3845 return -ENOMEM;
3849 3846
3850 mutex_init(&spec->amp_mutex);
3851 codec->spec = spec; 3847 codec->spec = spec;
3852 3848
3853 spec->multiout.max_channels = 2; 3849 spec->multiout.max_channels = 2;
@@ -4152,7 +4148,6 @@ static int patch_ad1882(struct hda_codec *codec)
4152 if (spec == NULL) 4148 if (spec == NULL)
4153 return -ENOMEM; 4149 return -ENOMEM;
4154 4150
4155 mutex_init(&spec->amp_mutex);
4156 codec->spec = spec; 4151 codec->spec = spec;
4157 4152
4158 spec->multiout.max_channels = 6; 4153 spec->multiout.max_channels = 6;
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 36fd85260035..e3df8ac37076 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -82,7 +82,6 @@ struct conexant_spec {
82 /* PCM information */ 82 /* PCM information */
83 struct hda_pcm pcm_rec[2]; /* used in build_pcms() */ 83 struct hda_pcm pcm_rec[2]; /* used in build_pcms() */
84 84
85 struct mutex amp_mutex; /* PCM volume/mute control mutex */
86 unsigned int spdif_route; 85 unsigned int spdif_route;
87 86
88 /* dynamic controls, init_verbs and input_mux */ 87 /* dynamic controls, init_verbs and input_mux */
@@ -928,7 +927,6 @@ static int patch_cxt5045(struct hda_codec *codec)
928 spec = kzalloc(sizeof(*spec), GFP_KERNEL); 927 spec = kzalloc(sizeof(*spec), GFP_KERNEL);
929 if (!spec) 928 if (!spec)
930 return -ENOMEM; 929 return -ENOMEM;
931 mutex_init(&spec->amp_mutex);
932 codec->spec = spec; 930 codec->spec = spec;
933 931
934 spec->multiout.max_channels = 2; 932 spec->multiout.max_channels = 2;
@@ -1477,7 +1475,6 @@ static int patch_cxt5047(struct hda_codec *codec)
1477 spec = kzalloc(sizeof(*spec), GFP_KERNEL); 1475 spec = kzalloc(sizeof(*spec), GFP_KERNEL);
1478 if (!spec) 1476 if (!spec)
1479 return -ENOMEM; 1477 return -ENOMEM;
1480 mutex_init(&spec->amp_mutex);
1481 codec->spec = spec; 1478 codec->spec = spec;
1482 1479
1483 spec->multiout.max_channels = 2; 1480 spec->multiout.max_channels = 2;
@@ -1736,7 +1733,6 @@ static int patch_cxt5051(struct hda_codec *codec)
1736 spec = kzalloc(sizeof(*spec), GFP_KERNEL); 1733 spec = kzalloc(sizeof(*spec), GFP_KERNEL);
1737 if (!spec) 1734 if (!spec)
1738 return -ENOMEM; 1735 return -ENOMEM;
1739 mutex_init(&spec->amp_mutex);
1740 codec->spec = spec; 1736 codec->spec = spec;
1741 1737
1742 codec->patch_ops = conexant_patch_ops; 1738 codec->patch_ops = conexant_patch_ops;