ASoC: Constify snd_soc_dai_ops structs
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mark Brown
AppliedQuoted 7 lines · Lars-Peter Clausen
Commit 1ee46ebd("ASoC: Make the DAI ops constant in the DAI structure") introduced the possibility to have constant DAI ops structures, yet this is barley used in both existing drivers and also new drivers being submitted, although none of them modifies its DAI ops structure. The later is not surprising since existing drivers are often used as templates for new drivers. So this patch just constifies all existing
snd_soc_dai_opsstructs to eliminate the issue altogether.
Applied, thanks.
Lars-Peter Clausen
maintainerQuoted 10 lines · Mark Brown
Quoted 7 lines · Lars-Peter Clausen
Commit 1ee46ebd("ASoC: Make the DAI ops constant in the DAI structure") introduced the possibility to have constant DAI ops structures, yet this is barley used in both existing drivers and also new drivers being submitted, although none of them modifies its DAI ops structure. The later is not surprising since existing drivers are often used as templates for new drivers. So this patch just constifies all existing
snd_soc_dai_opsstructs to eliminate the issue altogether.Applied, thanks.
Argh, looks like I have to work a bit more on my coccinelle skills, I introduced a few 'const const struct snd_soc_dai_ops' in this patch, which I overlooked, since this seems to be legal C. Will send a followup cleanup patch.
Lars-Peter Clausen
maintainerPATCH 1/1 ASoC: Cleanup duplicated const
In reply to a message not in the archiveCommit 85e7652("ASoC: Constify snd_soc_dai_ops structs") accidentally introduced a few duplicated consts. This patch cleans it up.
--- sound/soc/au1x/i2sc.c | 2 +- sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/adau1701.c | 2 +- sound/soc/codecs/adav80x.c | 2 +- sound/soc/codecs/cs42l73.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
sound/soc/au1x/i2sc.c +1 -1
@@ -201,7 +201,7 @@ static int au1xi2s_startup(struct snd_pcm_substream *substream,return 0 ; } -static const const struct snd_soc_dai_ops au1xi2s_dai_ops = { +static const struct snd_soc_dai_ops au1xi2s_dai_ops = { .startup = au1xi2s_startup, .trigger = au1xi2s_trigger, .hw_params = au1xi2s_hw_params,
sound/soc/codecs/adau1373.c +1 -1
@@ -1042,7 +1042,7 @@ static int adau1373_set_dai_sysclk(struct snd_soc_dai *dai,return 0 ; } -static const const struct snd_soc_dai_ops adau1373_dai_ops = { +static const struct snd_soc_dai_ops adau1373_dai_ops = { .hw_params = adau1373_hw_params, .set_sysclk = adau1373_set_dai_sysclk, .set_fmt = adau1373_set_dai_fmt,
sound/soc/codecs/adau1701.c +1 -1
@@ -427,7 +427,7 @@ static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id,#define ADAU1701_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE) -static const const struct snd_soc_dai_ops adau1701_dai_ops = { +static const struct snd_soc_dai_ops adau1701_dai_ops = { .set_fmt = adau1701_set_dai_fmt, .hw_params = adau1701_hw_params, .digital_mute = adau1701_digital_mute,
sound/soc/codecs/adav80x.c +1 -1
@@ -718,7 +718,7 @@ static void adav80x_dai_shutdown(struct snd_pcm_substream *substream, adav80x->rate =0 ; } -static const const struct snd_soc_dai_ops adav80x_dai_ops = { +static const struct snd_soc_dai_ops adav80x_dai_ops = { .set_fmt = adav80x_set_dai_fmt, .hw_params = adav80x_hw_params, .startup = adav80x_dai_startup,
sound/soc/codecs/cs42l73.c +1 -1
@@ -1190,7 +1190,7 @@ static int cs42l73_pcm_startup(struct snd_pcm_substream *substream,#define CS42L73_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE) -static const const struct snd_soc_dai_ops cs42l73_ops = { +static const struct snd_soc_dai_ops cs42l73_ops = { .startup = cs42l73_pcm_startup, .hw_params = cs42l73_pcm_hw_params, .set_fmt = cs42l73_set_dai_fmt,
Signature · 1 line
1.7.7.1
Mark Brown
AppliedRe: [PATCH] ASoC: Cleanup duplicated const
Quoted 2 lines · Lars-Peter Clausen
Commit 85e7652("ASoC: Constify
snd_soc_dai_opsstructs") accidentally introduced a few duplicated consts. This patch cleans it up.
Applied, thanks.