diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-11-23 08:11:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 08:11:50 -0500 |
commit | 890754a878c887de50bc0c9f9041b8b73bd09937 (patch) | |
tree | bdc532f8e10ea9346ea62eea00e97e749d20f163 | |
parent | 554671230b9d2f79026897226546f399de4d4a50 (diff) |
ASoC: Cleanup duplicated const
Commit 85e7652("ASoC: Constify snd_soc_dai_ops structs") accidentally
introduced a few duplicated consts. This patch cleans it up.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/au1x/i2sc.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/adau1373.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/adau1701.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/adav80x.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/cs42l73.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c index 2d5f755ac99c..6bcf48f5884c 100644 --- a/sound/soc/au1x/i2sc.c +++ b/sound/soc/au1x/i2sc.c | |||
@@ -201,7 +201,7 @@ static int au1xi2s_startup(struct snd_pcm_substream *substream, | |||
201 | return 0; | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||
204 | static const const struct snd_soc_dai_ops au1xi2s_dai_ops = { | 204 | static const struct snd_soc_dai_ops au1xi2s_dai_ops = { |
205 | .startup = au1xi2s_startup, | 205 | .startup = au1xi2s_startup, |
206 | .trigger = au1xi2s_trigger, | 206 | .trigger = au1xi2s_trigger, |
207 | .hw_params = au1xi2s_hw_params, | 207 | .hw_params = au1xi2s_hw_params, |
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 2e040af9ad57..45c63028b40d 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c | |||
@@ -1042,7 +1042,7 @@ static int adau1373_set_dai_sysclk(struct snd_soc_dai *dai, | |||
1042 | return 0; | 1042 | return 0; |
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | static const const struct snd_soc_dai_ops adau1373_dai_ops = { | 1045 | static const struct snd_soc_dai_ops adau1373_dai_ops = { |
1046 | .hw_params = adau1373_hw_params, | 1046 | .hw_params = adau1373_hw_params, |
1047 | .set_sysclk = adau1373_set_dai_sysclk, | 1047 | .set_sysclk = adau1373_set_dai_sysclk, |
1048 | .set_fmt = adau1373_set_dai_fmt, | 1048 | .set_fmt = adau1373_set_dai_fmt, |
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index c69bdfe745bb..8b7e1c50d6e9 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c | |||
@@ -427,7 +427,7 @@ static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id, | |||
427 | #define ADAU1701_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ | 427 | #define ADAU1701_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ |
428 | SNDRV_PCM_FMTBIT_S24_LE) | 428 | SNDRV_PCM_FMTBIT_S24_LE) |
429 | 429 | ||
430 | static const const struct snd_soc_dai_ops adau1701_dai_ops = { | 430 | static const struct snd_soc_dai_ops adau1701_dai_ops = { |
431 | .set_fmt = adau1701_set_dai_fmt, | 431 | .set_fmt = adau1701_set_dai_fmt, |
432 | .hw_params = adau1701_hw_params, | 432 | .hw_params = adau1701_hw_params, |
433 | .digital_mute = adau1701_digital_mute, | 433 | .digital_mute = adau1701_digital_mute, |
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index d927febd02cc..f9f08948e5e8 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c | |||
@@ -718,7 +718,7 @@ static void adav80x_dai_shutdown(struct snd_pcm_substream *substream, | |||
718 | adav80x->rate = 0; | 718 | adav80x->rate = 0; |
719 | } | 719 | } |
720 | 720 | ||
721 | static const const struct snd_soc_dai_ops adav80x_dai_ops = { | 721 | static const struct snd_soc_dai_ops adav80x_dai_ops = { |
722 | .set_fmt = adav80x_set_dai_fmt, | 722 | .set_fmt = adav80x_set_dai_fmt, |
723 | .hw_params = adav80x_hw_params, | 723 | .hw_params = adav80x_hw_params, |
724 | .startup = adav80x_dai_startup, | 724 | .startup = adav80x_dai_startup, |
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 75d80b2e1ec4..d09578f397da 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c | |||
@@ -1190,7 +1190,7 @@ static int cs42l73_pcm_startup(struct snd_pcm_substream *substream, | |||
1190 | #define CS42L73_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ | 1190 | #define CS42L73_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ |
1191 | SNDRV_PCM_FMTBIT_S24_LE) | 1191 | SNDRV_PCM_FMTBIT_S24_LE) |
1192 | 1192 | ||
1193 | static const const struct snd_soc_dai_ops cs42l73_ops = { | 1193 | static const struct snd_soc_dai_ops cs42l73_ops = { |
1194 | .startup = cs42l73_pcm_startup, | 1194 | .startup = cs42l73_pcm_startup, |
1195 | .hw_params = cs42l73_pcm_hw_params, | 1195 | .hw_params = cs42l73_pcm_hw_params, |
1196 | .set_fmt = cs42l73_set_dai_fmt, | 1196 | .set_fmt = cs42l73_set_dai_fmt, |