diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-10 16:41:51 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-18 10:37:59 -0500 |
commit | 4bafcf074aca3bd191e4d93c6a140ca52654f192 (patch) | |
tree | de429f5b3d5e12e072c4ef245be24f36e86d49a9 /sound/soc/codecs | |
parent | 6794f709b7124ff1e574c4f4c9494418ab56c4b4 (diff) |
ASoC: Drop ac97_control initialization from CODEC driver DAIs
This is no longer necessary as there is no code anymore that uses this for
CODEC DAIs.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/ac97.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/ad1980.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/stac9766.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm9705.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm9712.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm9713.c | 1 |
6 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index bd9b1839c8b0..5d90924e8b96 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c | |||
@@ -53,7 +53,6 @@ static const struct snd_soc_dai_ops ac97_dai_ops = { | |||
53 | 53 | ||
54 | static struct snd_soc_dai_driver ac97_dai = { | 54 | static struct snd_soc_dai_driver ac97_dai = { |
55 | .name = "ac97-hifi", | 55 | .name = "ac97-hifi", |
56 | .ac97_control = 1, | ||
57 | .playback = { | 56 | .playback = { |
58 | .stream_name = "AC97 Playback", | 57 | .stream_name = "AC97 Playback", |
59 | .channels_min = 1, | 58 | .channels_min = 1, |
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index f71cc21e67d4..c6cb101a5b8f 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c | |||
@@ -170,7 +170,6 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, | |||
170 | 170 | ||
171 | static struct snd_soc_dai_driver ad1980_dai = { | 171 | static struct snd_soc_dai_driver ad1980_dai = { |
172 | .name = "ad1980-hifi", | 172 | .name = "ad1980-hifi", |
173 | .ac97_control = 1, | ||
174 | .playback = { | 173 | .playback = { |
175 | .stream_name = "Playback", | 174 | .stream_name = "Playback", |
176 | .channels_min = 2, | 175 | .channels_min = 2, |
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 45ac4a71ecff..c0808061b08a 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c | |||
@@ -294,7 +294,6 @@ static const struct snd_soc_dai_ops stac9766_dai_ops_digital = { | |||
294 | static struct snd_soc_dai_driver stac9766_dai[] = { | 294 | static struct snd_soc_dai_driver stac9766_dai[] = { |
295 | { | 295 | { |
296 | .name = "stac9766-hifi-analog", | 296 | .name = "stac9766-hifi-analog", |
297 | .ac97_control = 1, | ||
298 | 297 | ||
299 | /* stream cababilities */ | 298 | /* stream cababilities */ |
300 | .playback = { | 299 | .playback = { |
@@ -316,7 +315,6 @@ static struct snd_soc_dai_driver stac9766_dai[] = { | |||
316 | }, | 315 | }, |
317 | { | 316 | { |
318 | .name = "stac9766-hifi-IEC958", | 317 | .name = "stac9766-hifi-IEC958", |
319 | .ac97_control = 1, | ||
320 | 318 | ||
321 | /* stream cababilities */ | 319 | /* stream cababilities */ |
322 | .playback = { | 320 | .playback = { |
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 2cb8a31819fa..5b5118ba1526 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c | |||
@@ -263,7 +263,6 @@ static const struct snd_soc_dai_ops wm9705_dai_ops = { | |||
263 | static struct snd_soc_dai_driver wm9705_dai[] = { | 263 | static struct snd_soc_dai_driver wm9705_dai[] = { |
264 | { | 264 | { |
265 | .name = "wm9705-hifi", | 265 | .name = "wm9705-hifi", |
266 | .ac97_control = 1, | ||
267 | .playback = { | 266 | .playback = { |
268 | .stream_name = "HiFi Playback", | 267 | .stream_name = "HiFi Playback", |
269 | .channels_min = 1, | 268 | .channels_min = 1, |
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 6b36223fd247..9fa794baa5f8 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
@@ -565,7 +565,6 @@ static const struct snd_soc_dai_ops wm9712_dai_ops_aux = { | |||
565 | static struct snd_soc_dai_driver wm9712_dai[] = { | 565 | static struct snd_soc_dai_driver wm9712_dai[] = { |
566 | { | 566 | { |
567 | .name = "wm9712-hifi", | 567 | .name = "wm9712-hifi", |
568 | .ac97_control = 1, | ||
569 | .playback = { | 568 | .playback = { |
570 | .stream_name = "HiFi Playback", | 569 | .stream_name = "HiFi Playback", |
571 | .channels_min = 1, | 570 | .channels_min = 1, |
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 2071df707e88..cd1b266d3af3 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -1076,7 +1076,6 @@ static const struct snd_soc_dai_ops wm9713_dai_ops_voice = { | |||
1076 | static struct snd_soc_dai_driver wm9713_dai[] = { | 1076 | static struct snd_soc_dai_driver wm9713_dai[] = { |
1077 | { | 1077 | { |
1078 | .name = "wm9713-hifi", | 1078 | .name = "wm9713-hifi", |
1079 | .ac97_control = 1, | ||
1080 | .playback = { | 1079 | .playback = { |
1081 | .stream_name = "HiFi Playback", | 1080 | .stream_name = "HiFi Playback", |
1082 | .channels_min = 1, | 1081 | .channels_min = 1, |