* [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits
@ 2021-01-15 4:51 Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 01/44] ASoC: soc-pcm: revert soc_pcm_apply_symmetry() Kuninori Morimoto
` (44 more replies)
0 siblings, 45 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:51 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
Hi Mark
snd_pcm_runtime / snd_soc_dai / snd_soc_dai_driver / snd_soc_dai_link
have related parameter which is similar but not same naming.
struct snd_pcm_runtime {
...
(A) unsigned int rate;
...
(B) unsigned int sample_bits;
...
};
struct snd_soc_dai {
...
(A) unsigned int rate;
(B) unsigned int sample_bits;
...
};
struct snd_soc_dai_driver {
...
(A) unsigned int symmetric_rates:1;
(B) unsigned int symmetric_samplebits:1;
...
};
struct snd_soc_dai_link {
...
(A) unsigned int symmetric_rates:1;
(B) unsigned int symmetric_samplebits:1;
...
};
Because it is similar but not same naming rule,
code can be verbose / can't share macro.
This patch-set sync naming rule
to struct snd_pcm_runtime base.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Kuninori Morimoto (44):
ASoC: soc-pcm: revert soc_pcm_apply_symmetry()
ASoC: sync parameter naming : rate / sample_bits
ASoC: adi: sync parameter naming (rate/sample_bits)
ASoC: atmel: sync parameter naming (rate/sample_bits)
ASoC: au1x: sync parameter naming (rate/sample_bits)
ASoC: bcm: sync parameter naming (rate/sample_bits)
ASoC: cirrus: sync parameter naming (rate/sample_bits)
ASoC: tegra: sync parameter naming (rate/sample_bits)
ASoC: rockchip: sync parameter naming (rate/sample_bits)
ASoC: samsung: sync parameter naming (rate/sample_bits)
ASoC: sh: sync parameter naming (rate/sample_bits)
ASoC: ti: sync parameter naming (rate/sample_bits)
ASoC: pxa: sync parameter naming (rate/sample_bits)
ASoC: mediatek: sync parameter naming (rate/sample_bits)
ASoC: fsl: sync parameter naming (rate/sample_bits)
ASoC: wm*: sync parameter naming (rate/sample_bits)
ASoC: tlv*: sync parameter naming (rate/sample_bits)
ASoC: rt*: sync parameter naming (rate/sample_bits)
ASoC: nau*: sync parameter naming (rate/sample_bits)
ASoC: tas*: sync parameter naming (rate/sample_bits)
ASoC: da*: sync parameter naming (rate/sample_bits)
ASoC: es*: sync parameter naming (rate/sample_bits)
ASoC: max*: sync parameter naming (rate/sample_bits)
ASoC: cs*: sync parameter naming (rate/sample_bits)
ASoC: tscs*: sync parameter naming (rate/sample_bits)
ASoC: ak*: sync parameter naming (rate/sample_bits)
ASoC: adau*: sync parameter naming (rate/sample_bits)
ASoC: jz4740: sync parameter naming (rate/sample_bits)
ASoC: sunxi: sync parameter naming (rate/sample_bits)
ASoC: zl38060: sync parameter naming (rate/sample_bits)
ASoC: ssm2602: sync parameter naming (rate/sample_bits)
ASoC: sgtl5000: sync parameter naming (rate/sample_bits)
ASoC: mc13783: sync parameter naming (rate/sample_bits)
ASoC: mt6660: sync parameter naming (rate/sample_bits)
ASoC: lochnagar-sc: sync parameter naming (rate/sample_bits)
ASoC: ab8500: sync parameter naming (rate/sample_bits)
ASoC: alc5632: sync parameter naming (rate/sample_bits)
ASoC: cx2072x: sync parameter naming (rate/sample_bits)
ASoC: inno_rk3036: sync parameter naming (rate/sample_bits)
ASoC: lm49453: sync parameter naming (rate/sample_bits)
ASoC: ml26124: sync parameter naming (rate/sample_bits)
ASoC: soc-dai.h: remove symmetric_rates/samplebits
ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry()
ASoC: soc-pcm: cleanup soc_pcm_params_symmetry()
include/sound/soc-dai.h | 4 +-
include/sound/soc.h | 4 +-
sound/soc/adi/axi-i2s.c | 2 +-
sound/soc/atmel/atmel-i2s.c | 2 +-
sound/soc/atmel/mchp-i2s-mcc.c | 4 +-
sound/soc/au1x/i2sc.c | 2 +-
sound/soc/bcm/bcm2835-i2s.c | 4 +-
sound/soc/bcm/bcm63xx-i2s-whistler.c | 2 +-
sound/soc/cirrus/ep93xx-i2s.c | 2 +-
sound/soc/codecs/ab8500-codec.c | 4 +-
sound/soc/codecs/adau1372.c | 2 +-
sound/soc/codecs/adau1373.c | 6 +-
sound/soc/codecs/adau1701.c | 2 +-
sound/soc/codecs/ak4554.c | 2 +-
sound/soc/codecs/ak4613.c | 2 +-
sound/soc/codecs/ak4641.c | 4 +-
sound/soc/codecs/ak4642.c | 2 +-
sound/soc/codecs/alc5632.c | 2 +-
sound/soc/codecs/cs35l32.c | 2 +-
sound/soc/codecs/cs35l33.c | 2 +-
sound/soc/codecs/cs35l34.c | 2 +-
sound/soc/codecs/cs35l35.c | 2 +-
sound/soc/codecs/cs35l36.c | 2 +-
sound/soc/codecs/cs4234.c | 2 +-
sound/soc/codecs/cs4271.c | 2 +-
sound/soc/codecs/cs42l73.c | 6 +-
sound/soc/codecs/cs43130.c | 6 +-
sound/soc/codecs/cs4341.c | 2 +-
sound/soc/codecs/cs4349.c | 2 +-
sound/soc/codecs/cs47l15.c | 12 ++--
sound/soc/codecs/cs47l24.c | 12 ++--
sound/soc/codecs/cs47l35.c | 12 ++--
sound/soc/codecs/cs47l85.c | 16 ++---
sound/soc/codecs/cs47l90.c | 16 ++---
sound/soc/codecs/cs47l92.c | 12 ++--
sound/soc/codecs/cs53l30.c | 2 +-
sound/soc/codecs/cx2072x.c | 2 +-
sound/soc/codecs/da7210.c | 2 +-
sound/soc/codecs/da7213.c | 2 +-
sound/soc/codecs/da7218.c | 4 +-
sound/soc/codecs/da7219.c | 4 +-
sound/soc/codecs/da9055.c | 2 +-
sound/soc/codecs/es8316.c | 2 +-
sound/soc/codecs/es8328.c | 2 +-
sound/soc/codecs/inno_rk3036.c | 2 +-
sound/soc/codecs/jz4740.c | 2 +-
sound/soc/codecs/lm49453.c | 2 +-
sound/soc/codecs/lochnagar-sc.c | 12 ++--
sound/soc/codecs/max9860.c | 2 +-
sound/soc/codecs/max9867.c | 2 +-
sound/soc/codecs/mc13783.c | 2 +-
sound/soc/codecs/ml26124.c | 2 +-
sound/soc/codecs/mt6660.c | 4 +-
sound/soc/codecs/nau8810.c | 2 +-
sound/soc/codecs/nau8822.c | 2 +-
sound/soc/codecs/rt274.c | 2 +-
sound/soc/codecs/rt286.c | 4 +-
sound/soc/codecs/rt298.c | 4 +-
sound/soc/codecs/rt5670.c | 4 +-
sound/soc/codecs/sgtl5000.c | 2 +-
sound/soc/codecs/ssm2602.c | 4 +-
sound/soc/codecs/tas2764.c | 2 +-
sound/soc/codecs/tas2770.c | 2 +-
sound/soc/codecs/tlv320adcx140.c | 2 +-
sound/soc/codecs/tlv320aic31xx.c | 4 +-
sound/soc/codecs/tlv320aic32x4.c | 2 +-
sound/soc/codecs/tlv320aic3x.c | 2 +-
sound/soc/codecs/tscs42xx.c | 4 +-
sound/soc/codecs/tscs454.c | 12 ++--
sound/soc/codecs/wm5102.c | 12 ++--
sound/soc/codecs/wm5110.c | 12 ++--
sound/soc/codecs/wm8510.c | 2 +-
sound/soc/codecs/wm8731.c | 2 +-
sound/soc/codecs/wm8770.c | 2 +-
sound/soc/codecs/wm8804.c | 2 +-
sound/soc/codecs/wm8903.c | 2 +-
sound/soc/codecs/wm8904.c | 2 +-
sound/soc/codecs/wm8940.c | 2 +-
sound/soc/codecs/wm8960.c | 2 +-
sound/soc/codecs/wm8962.c | 2 +-
sound/soc/codecs/wm8974.c | 2 +-
sound/soc/codecs/wm8978.c | 2 +-
sound/soc/codecs/wm8983.c | 2 +-
sound/soc/codecs/wm8985.c | 2 +-
sound/soc/codecs/wm8988.c | 2 +-
sound/soc/codecs/wm8993.c | 2 +-
sound/soc/codecs/wm8994.c | 4 +-
sound/soc/codecs/wm8997.c | 8 +--
sound/soc/codecs/wm8998.c | 12 ++--
sound/soc/codecs/wm9713.c | 2 +-
sound/soc/codecs/zl38060.c | 4 +-
sound/soc/fsl/fsl_esai.c | 4 +-
sound/soc/fsl/fsl_sai.c | 8 +--
sound/soc/fsl/fsl_ssi.c | 4 +-
sound/soc/jz4740/jz4740-i2s.c | 2 +-
sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 10 +--
sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 +--
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +-
sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 8 +--
sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 +--
sound/soc/pxa/pxa2xx-i2s.c | 2 +-
sound/soc/rockchip/rockchip_i2s.c | 4 +-
sound/soc/rockchip/rockchip_pdm.c | 2 +-
sound/soc/samsung/i2s.c | 2 +-
sound/soc/samsung/pcm.c | 2 +-
sound/soc/sh/rcar/core.c | 4 +-
sound/soc/soc-pcm.c | 80 +++++++---------------
sound/soc/soc-topology.c | 8 +--
sound/soc/sunxi/sun4i-i2s.c | 2 +-
sound/soc/sunxi/sun8i-codec.c | 12 ++--
sound/soc/tegra/tegra186_dspk.c | 2 +-
sound/soc/tegra/tegra20_i2s.c | 2 +-
sound/soc/tegra/tegra210_dmic.c | 2 +-
sound/soc/tegra/tegra210_i2s.c | 2 +-
sound/soc/tegra/tegra30_i2s.c | 2 +-
sound/soc/ti/davinci-mcasp.c | 2 +-
116 files changed, 253 insertions(+), 283 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 01/44] ASoC: soc-pcm: revert soc_pcm_apply_symmetry()
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
@ 2021-01-15 4:52 ` Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 02/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (43 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:52 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
commit a39748d03cbc ("ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry()")
was applied by miscommunication.
To more cleanup code, and to be easy review, this patch reverts it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 67 +++++++++++++++++++++++++++++++--------------
1 file changed, 47 insertions(+), 20 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index f62136f16c2f..6e9f14d482ab 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -349,26 +349,53 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
int ret;
-#define __soc_pcm_apply_symmetry(name, sname, NAME) \
- if (soc_dai->name && (soc_dai->driver->symmetric_##sname || \
- rtd->dai_link->symmetric_##sname)) { \
- dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %s to %d\n",\
- #name, soc_dai->name); \
- \
- ret = snd_pcm_hw_constraint_single(substream->runtime, \
- SNDRV_PCM_HW_PARAM_##NAME,\
- soc_dai->name); \
- if (ret < 0) { \
- dev_err(soc_dai->dev, \
- "ASoC: Unable to apply %s constraint: %d\n",\
- #name, ret); \
- return ret; \
- } \
- }
-
- __soc_pcm_apply_symmetry(rate, rates, RATE);
- __soc_pcm_apply_symmetry(channels, channels, CHANNELS);
- __soc_pcm_apply_symmetry(sample_bits, samplebits, SAMPLE_BITS);
+ if (soc_dai->rate && (soc_dai->driver->symmetric_rates ||
+ rtd->dai_link->symmetric_rates)) {
+ dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %dHz rate\n",
+ soc_dai->rate);
+
+ ret = snd_pcm_hw_constraint_single(substream->runtime,
+ SNDRV_PCM_HW_PARAM_RATE,
+ soc_dai->rate);
+ if (ret < 0) {
+ dev_err(soc_dai->dev,
+ "ASoC: Unable to apply rate constraint: %d\n",
+ ret);
+ return ret;
+ }
+ }
+
+ if (soc_dai->channels && (soc_dai->driver->symmetric_channels ||
+ rtd->dai_link->symmetric_channels)) {
+ dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d channel(s)\n",
+ soc_dai->channels);
+
+ ret = snd_pcm_hw_constraint_single(substream->runtime,
+ SNDRV_PCM_HW_PARAM_CHANNELS,
+ soc_dai->channels);
+ if (ret < 0) {
+ dev_err(soc_dai->dev,
+ "ASoC: Unable to apply channel symmetry constraint: %d\n",
+ ret);
+ return ret;
+ }
+ }
+
+ if (soc_dai->sample_bits && (soc_dai->driver->symmetric_samplebits ||
+ rtd->dai_link->symmetric_samplebits)) {
+ dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d sample bits\n",
+ soc_dai->sample_bits);
+
+ ret = snd_pcm_hw_constraint_single(substream->runtime,
+ SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
+ soc_dai->sample_bits);
+ if (ret < 0) {
+ dev_err(soc_dai->dev,
+ "ASoC: Unable to apply sample bits symmetry constraint: %d\n",
+ ret);
+ return ret;
+ }
+ }
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 02/44] ASoC: sync parameter naming : rate / sample_bits
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 01/44] ASoC: soc-pcm: revert soc_pcm_apply_symmetry() Kuninori Morimoto
@ 2021-01-15 4:52 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 03/44] ASoC: adi: sync parameter naming (rate/sample_bits) Kuninori Morimoto
` (42 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:52 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
snd_pcm_runtime / snd_soc_dai / snd_soc_dai_driver / snd_soc_dai_link
have related parameter which is similar but not same naming.
struct snd_pcm_runtime {
...
(A) unsigned int rate;
...
(B) unsigned int sample_bits;
...
};
struct snd_soc_dai {
...
(A) unsigned int rate;
(B) unsigned int sample_bits;
...
};
struct snd_soc_dai_driver {
...
(A) unsigned int symmetric_rates:1;
(B) unsigned int symmetric_samplebits:1;
...
};
struct snd_soc_dai_link {
...
(A) unsigned int symmetric_rates:1;
(B) unsigned int symmetric_samplebits:1;
...
};
Because it is similar but not same naming rule,
code can be verbose / can't share macro.
This patch sync naming rule for framework.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
old name will be removed if all drivers were switched
to new naming rule.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc-dai.h | 6 ++++--
include/sound/soc.h | 4 ++--
sound/soc/rockchip/rockchip_i2s.c | 2 +-
sound/soc/soc-core.c | 9 +++++++++
sound/soc/soc-pcm.c | 24 ++++++++++++------------
sound/soc/soc-topology.c | 8 ++++----
6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 34d0dbf73ca9..ee3c6deb5719 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -353,9 +353,11 @@ struct snd_soc_dai_driver {
/* DAI capabilities */
struct snd_soc_pcm_stream capture;
struct snd_soc_pcm_stream playback;
- unsigned int symmetric_rates:1;
+ unsigned int symmetric_rates:1; /* will be removed */
+ unsigned int symmetric_rate:1;
unsigned int symmetric_channels:1;
- unsigned int symmetric_samplebits:1;
+ unsigned int symmetric_samplebits:1; /* will be removed */
+ unsigned int symmetric_sample_bits:1;
/* probe ordering - for components with runtime dependencies */
int probe_order;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3fa6c40a63b7..bd38015d6c6d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -685,9 +685,9 @@ struct snd_soc_dai_link {
unsigned int ignore_suspend:1;
/* Symmetry requirements */
- unsigned int symmetric_rates:1;
+ unsigned int symmetric_rate:1;
unsigned int symmetric_channels:1;
- unsigned int symmetric_samplebits:1;
+ unsigned int symmetric_sample_bits:1;
/* Do not create a PCM for this DAI link (Backend link) */
unsigned int no_pcm:1;
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index eae287d905eb..662de86eca11 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -373,7 +373,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
I2S_DMACR_RDL(16));
val = I2S_CKR_TRCM_TXRX;
- if (dai->driver->symmetric_rates && rtd->dai_link->symmetric_rates)
+ if (dai->driver->symmetric_rate && rtd->dai_link->symmetric_rate)
val = I2S_CKR_TRCM_TXONLY;
regmap_update_bits(i2s->regmap, I2S_CKR,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f6d4e99b590c..bb8323cad51a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2509,6 +2509,15 @@ int snd_soc_register_component(struct device *dev,
{
struct snd_soc_component *component;
int ret;
+ int i;
+
+ /* Remove ME */
+ for (i = 0; i < num_dai; i++) {
+ if (dai_drv[i].symmetric_rates)
+ dai_drv[i].symmetric_rate = dai_drv[i].symmetric_rates;
+ if (dai_drv[i].symmetric_samplebits)
+ dai_drv[i].symmetric_sample_bits = dai_drv[i].symmetric_samplebits;
+ }
component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL);
if (!component)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 6e9f14d482ab..1a5d0cb3dc69 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -349,8 +349,8 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
int ret;
- if (soc_dai->rate && (soc_dai->driver->symmetric_rates ||
- rtd->dai_link->symmetric_rates)) {
+ if (soc_dai->rate && (soc_dai->driver->symmetric_rate ||
+ rtd->dai_link->symmetric_rate)) {
dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %dHz rate\n",
soc_dai->rate);
@@ -381,8 +381,8 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream,
}
}
- if (soc_dai->sample_bits && (soc_dai->driver->symmetric_samplebits ||
- rtd->dai_link->symmetric_samplebits)) {
+ if (soc_dai->sample_bits && (soc_dai->driver->symmetric_sample_bits ||
+ rtd->dai_link->symmetric_sample_bits)) {
dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d sample bits\n",
soc_dai->sample_bits);
@@ -412,10 +412,10 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream,
soc_pcm_set_dai_params(&d, params);
/* reject unmatched parameters when applying symmetry */
- symmetry = rtd->dai_link->symmetric_rates;
+ symmetry = rtd->dai_link->symmetric_rate;
for_each_rtd_cpu_dais(rtd, i, dai)
- symmetry |= dai->driver->symmetric_rates;
+ symmetry |= dai->driver->symmetric_rate;
if (symmetry) {
for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
@@ -443,10 +443,10 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream,
}
}
- symmetry = rtd->dai_link->symmetric_samplebits;
+ symmetry = rtd->dai_link->symmetric_sample_bits;
for_each_rtd_dais(rtd, i, dai)
- symmetry |= dai->driver->symmetric_samplebits;
+ symmetry |= dai->driver->symmetric_sample_bits;
if (symmetry) {
for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
@@ -469,15 +469,15 @@ static bool soc_pcm_has_symmetry(struct snd_pcm_substream *substream)
struct snd_soc_dai *dai;
unsigned int symmetry, i;
- symmetry = link->symmetric_rates ||
+ symmetry = link->symmetric_rate ||
link->symmetric_channels ||
- link->symmetric_samplebits;
+ link->symmetric_sample_bits;
for_each_rtd_dais(rtd, i, dai)
symmetry = symmetry ||
- dai->driver->symmetric_rates ||
+ dai->driver->symmetric_rate ||
dai->driver->symmetric_channels ||
- dai->driver->symmetric_samplebits;
+ dai->driver->symmetric_sample_bits;
return symmetry;
}
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 950c45008e24..27f7dd8fb7f6 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1672,7 +1672,7 @@ static void set_dai_flags(struct snd_soc_dai_driver *dai_drv,
unsigned int flag_mask, unsigned int flags)
{
if (flag_mask & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES)
- dai_drv->symmetric_rates =
+ dai_drv->symmetric_rate =
flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES ? 1 : 0;
if (flag_mask & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS)
@@ -1681,7 +1681,7 @@ static void set_dai_flags(struct snd_soc_dai_driver *dai_drv,
1 : 0;
if (flag_mask & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS)
- dai_drv->symmetric_samplebits =
+ dai_drv->symmetric_sample_bits =
flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS ?
1 : 0;
}
@@ -1763,7 +1763,7 @@ static void set_link_flags(struct snd_soc_dai_link *link,
unsigned int flag_mask, unsigned int flags)
{
if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES)
- link->symmetric_rates =
+ link->symmetric_rate =
flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES ? 1 : 0;
if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS)
@@ -1772,7 +1772,7 @@ static void set_link_flags(struct snd_soc_dai_link *link,
1 : 0;
if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS)
- link->symmetric_samplebits =
+ link->symmetric_sample_bits =
flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS ?
1 : 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 03/44] ASoC: adi: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 01/44] ASoC: soc-pcm: revert soc_pcm_apply_symmetry() Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 02/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 04/44] ASoC: atmel: " Kuninori Morimoto
` (41 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/adi/axi-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c
index 8c4dc82be0df..aa082131fb90 100644
--- a/sound/soc/adi/axi-i2s.c
+++ b/sound/soc/adi/axi-i2s.c
@@ -156,7 +156,7 @@ static const struct snd_soc_dai_ops axi_i2s_dai_ops = {
static struct snd_soc_dai_driver axi_i2s_dai = {
.probe = axi_i2s_dai_probe,
.ops = &axi_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver axi_i2s_component = {
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 04/44] ASoC: atmel: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (2 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 03/44] ASoC: adi: sync parameter naming (rate/sample_bits) Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 05/44] ASoC: au1x: " Kuninori Morimoto
` (40 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/atmel/atmel-i2s.c | 2 +-
sound/soc/atmel/mchp-i2s-mcc.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c
index 232300dda548..7c6187e41f2b 100644
--- a/sound/soc/atmel/atmel-i2s.c
+++ b/sound/soc/atmel/atmel-i2s.c
@@ -541,7 +541,7 @@ static struct snd_soc_dai_driver atmel_i2s_dai = {
.formats = ATMEL_I2S_FORMATS,
},
.ops = &atmel_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver atmel_i2s_component = {
diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c
index 04acc18f2d72..6d5ae18f8b38 100644
--- a/sound/soc/atmel/mchp-i2s-mcc.c
+++ b/sound/soc/atmel/mchp-i2s-mcc.c
@@ -859,8 +859,8 @@ static struct snd_soc_dai_driver mchp_i2s_mcc_dai = {
.formats = MCHP_I2SMCC_FORMATS,
},
.ops = &mchp_i2s_mcc_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
.symmetric_channels = 1,
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 05/44] ASoC: au1x: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (3 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 04/44] ASoC: atmel: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 06/44] ASoC: bcm: " Kuninori Morimoto
` (39 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/au1x/i2sc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c
index 7fd08fafa490..65bd39f5032d 100644
--- a/sound/soc/au1x/i2sc.c
+++ b/sound/soc/au1x/i2sc.c
@@ -210,7 +210,7 @@ static const struct snd_soc_dai_ops au1xi2s_dai_ops = {
};
static struct snd_soc_dai_driver au1xi2s_dai_driver = {
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.playback = {
.rates = AU1XI2SC_RATES,
.formats = AU1XI2SC_FMTS,
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 06/44] ASoC: bcm: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (4 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 05/44] ASoC: au1x: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 07/44] ASoC: cirrus: " Kuninori Morimoto
` (38 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/bcm/bcm2835-i2s.c | 4 ++--
sound/soc/bcm/bcm63xx-i2s-whistler.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index c2f7631e8705..3d668f449bc1 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -783,8 +783,8 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
| SNDRV_PCM_FMTBIT_S32_LE
},
.ops = &bcm2835_i2s_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
};
static bool bcm2835_i2s_volatile_reg(struct device *dev, unsigned int reg)
diff --git a/sound/soc/bcm/bcm63xx-i2s-whistler.c b/sound/soc/bcm/bcm63xx-i2s-whistler.c
index 246a57ac6679..527caf430715 100644
--- a/sound/soc/bcm/bcm63xx-i2s-whistler.c
+++ b/sound/soc/bcm/bcm63xx-i2s-whistler.c
@@ -212,7 +212,7 @@ static struct snd_soc_dai_driver bcm63xx_i2s_dai = {
.formats = SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &bcm63xx_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 07/44] ASoC: cirrus: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (5 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 06/44] ASoC: bcm: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 08/44] ASoC: tegra: " Kuninori Morimoto
` (37 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/cirrus/ep93xx-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 371708b17c09..0d26550d0df8 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -404,7 +404,7 @@ static const struct snd_soc_dai_ops ep93xx_i2s_dai_ops = {
#define EP93XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_driver ep93xx_i2s_dai = {
- .symmetric_rates= 1,
+ .symmetric_rate = 1,
.probe = ep93xx_i2s_dai_probe,
.playback = {
.channels_min = 2,
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 08/44] ASoC: tegra: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (6 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 07/44] ASoC: cirrus: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 09/44] ASoC: rockchip: " Kuninori Morimoto
` (36 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/tegra/tegra186_dspk.c | 2 +-
sound/soc/tegra/tegra20_i2s.c | 2 +-
sound/soc/tegra/tegra210_dmic.c | 2 +-
sound/soc/tegra/tegra210_i2s.c | 2 +-
sound/soc/tegra/tegra30_i2s.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
index 7d9948fb2ca7..8ee9a77bd83d 100644
--- a/sound/soc/tegra/tegra186_dspk.c
+++ b/sound/soc/tegra/tegra186_dspk.c
@@ -217,7 +217,7 @@ static struct snd_soc_dai_driver tegra186_dspk_dais[] = {
SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &tegra186_dspk_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 005fc4e645aa..d7a3d046c8f8 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -260,7 +260,7 @@ static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.ops = &tegra20_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver tegra20_i2s_component = {
diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
index ead2c99bf72e..b096478cd2ef 100644
--- a/sound/soc/tegra/tegra210_dmic.c
+++ b/sound/soc/tegra/tegra210_dmic.c
@@ -228,7 +228,7 @@ static struct snd_soc_dai_driver tegra210_dmic_dais[] = {
SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &tegra210_dmic_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
index ca31ec92e508..45f31ccb49d8 100644
--- a/sound/soc/tegra/tegra210_i2s.c
+++ b/sound/soc/tegra/tegra210_i2s.c
@@ -577,7 +577,7 @@ static struct snd_soc_dai_driver tegra210_i2s_dais[] = {
SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &tegra210_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index db5a8587bfa4..6740df541508 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -316,7 +316,7 @@ static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.ops = &tegra30_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver tegra30_i2s_component = {
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 09/44] ASoC: rockchip: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (7 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 08/44] ASoC: tegra: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 10/44] ASoC: samsung: " Kuninori Morimoto
` (35 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/rockchip/rockchip_i2s.c | 2 +-
sound/soc/rockchip/rockchip_pdm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 662de86eca11..0740764e7f71 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -471,7 +471,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = {
SNDRV_PCM_FMTBIT_S32_LE),
},
.ops = &rockchip_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver rockchip_i2s_component = {
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
index e5f732747f71..9295d648624e 100644
--- a/sound/soc/rockchip/rockchip_pdm.c
+++ b/sound/soc/rockchip/rockchip_pdm.c
@@ -338,7 +338,7 @@ static struct snd_soc_dai_driver rockchip_pdm_dai = {
.formats = ROCKCHIP_PDM_FORMATS,
},
.ops = &rockchip_pdm_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver rockchip_pdm_component = {
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 10/44] ASoC: samsung: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (8 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 09/44] ASoC: rockchip: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 11/44] ASoC: sh: " Kuninori Morimoto
` (34 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/samsung/i2s.c | 2 +-
sound/soc/samsung/pcm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 4bdc268fd981..b043183174b2 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1175,7 +1175,7 @@ static int i2s_alloc_dais(struct samsung_i2s_priv *priv,
dai_drv->probe = samsung_i2s_dai_probe;
dai_drv->remove = samsung_i2s_dai_remove;
- dai_drv->symmetric_rates = 1;
+ dai_drv->symmetric_rate = 1;
dai_drv->ops = &samsung_i2s_dai_ops;
dai_drv->playback.channels_min = 1;
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index 6f50c7b47326..bfd76e9cc0ca 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -452,7 +452,7 @@ static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)
#define S3C_PCM_RATES SNDRV_PCM_RATE_8000_96000
#define S3C_PCM_DAI_DECLARE \
- .symmetric_rates = 1, \
+ .symmetric_rate = 1, \
.probe = s3c_pcm_dai_probe, \
.ops = &s3c_pcm_dai_ops, \
.playback = { \
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 11/44] ASoC: sh: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (9 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 10/44] ASoC: samsung: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 12/44] ASoC: ti: " Kuninori Morimoto
` (33 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/rcar/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 6e670b3e92a0..c405bf3b4c99 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1320,8 +1320,8 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv,
if (rsnd_ssi_is_pin_sharing(io_capture) ||
rsnd_ssi_is_pin_sharing(io_playback)) {
- /* should have symmetric_rates if pin sharing */
- drv->symmetric_rates = 1;
+ /* should have symmetric_rate if pin sharing */
+ drv->symmetric_rate = 1;
}
dev_dbg(dev, "%s (%s/%s)\n", rdai->name,
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 12/44] ASoC: ti: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (10 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 11/44] ASoC: sh: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 13/44] ASoC: pxa: " Kuninori Morimoto
` (32 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/ti/davinci-mcasp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 6247ec3d3a09..b94220306d1a 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -1641,7 +1641,7 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
},
.ops = &davinci_mcasp_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "davinci-mcasp.1",
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 13/44] ASoC: pxa: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (11 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 12/44] ASoC: ti: " Kuninori Morimoto
@ 2021-01-15 4:53 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 14/44] ASoC: mediatek: " Kuninori Morimoto
` (31 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/pxa/pxa2xx-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 5301859a8453..bcde4a96c168 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -353,7 +353,7 @@ static struct snd_soc_dai_driver pxa_i2s_dai = {
.rates = PXA2XX_I2S_RATES,
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
.ops = &pxa_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver pxa_i2s_component = {
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 14/44] ASoC: mediatek: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (12 preceding siblings ...)
2021-01-15 4:53 ` [PATCH 13/44] ASoC: pxa: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 15/44] ASoC: fsl: " Kuninori Morimoto
` (30 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 10 +++++-----
sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 ++++----
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +-
sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 8 ++++----
sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 ++++----
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
index df29641c74aa..d5cffe7a7e15 100644
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
@@ -655,7 +655,7 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
},
.ops = &mt2701_afe_i2s_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "I2S1",
@@ -679,7 +679,7 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
| SNDRV_PCM_FMTBIT_S32_LE)
},
.ops = &mt2701_afe_i2s_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "I2S2",
@@ -703,7 +703,7 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
| SNDRV_PCM_FMTBIT_S32_LE)
},
.ops = &mt2701_afe_i2s_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "I2S3",
@@ -727,7 +727,7 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
| SNDRV_PCM_FMTBIT_S32_LE)
},
.ops = &mt2701_afe_i2s_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "MRG BT",
@@ -749,7 +749,7 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.ops = &mt2701_btmrg_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
diff --git a/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c b/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c
index 3136f0bc7827..51f736f319e4 100644
--- a/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c
+++ b/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c
@@ -270,8 +270,8 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {
.formats = MTK_PCM_FORMATS,
},
.ops = &mtk_dai_pcm_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "PCM 2",
@@ -291,8 +291,8 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {
.formats = MTK_PCM_FORMATS,
},
.ops = &mtk_dai_pcm_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
};
diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
index 7e7bda70d12e..685f4074b4e0 100644
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -571,7 +571,7 @@ static struct snd_soc_dai_driver mt8173_afe_pcm_dais[] = {
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.ops = &mt8173_afe_i2s_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c b/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c
index bc3ba3228f08..38ce0e36cdb4 100644
--- a/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c
+++ b/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c
@@ -270,8 +270,8 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {
.formats = MTK_PCM_FORMATS,
},
.ops = &mtk_dai_pcm_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "PCM 2",
@@ -291,8 +291,8 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {
.formats = MTK_PCM_FORMATS,
},
.ops = &mtk_dai_pcm_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
};
diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c b/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c
index 6e94cfdf06fc..239e3f5b53d3 100644
--- a/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c
+++ b/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c
@@ -360,8 +360,8 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {
.formats = MTK_PCM_FORMATS,
},
.ops = &mtk_dai_pcm_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "PCM 2",
@@ -381,8 +381,8 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {
.formats = MTK_PCM_FORMATS,
},
.ops = &mtk_dai_pcm_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 15/44] ASoC: fsl: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (13 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 14/44] ASoC: mediatek: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 16/44] ASoC: wm*: " Kuninori Morimoto
` (29 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/fsl/fsl_esai.c | 4 ++--
sound/soc/fsl/fsl_sai.c | 8 ++++----
sound/soc/fsl/fsl_ssi.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 39637ca78cdb..5a65cccdad22 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -1042,9 +1042,9 @@ static int fsl_esai_probe(struct platform_device *pdev)
/* Implement full symmetry for synchronous mode */
if (esai_priv->synchronous) {
- fsl_esai_dai.symmetric_rates = 1;
+ fsl_esai_dai.symmetric_rate = 1;
fsl_esai_dai.symmetric_channels = 1;
- fsl_esai_dai.symmetric_samplebits = 1;
+ fsl_esai_dai.symmetric_sample_bits = 1;
}
dev_set_drvdata(&pdev->dev, esai_priv);
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index f3d3d20d35d7..5e65b456d3e2 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1079,9 +1079,9 @@ static int fsl_sai_probe(struct platform_device *pdev)
/* Sync Tx with Rx as default by following old DT binding */
sai->synchronous[RX] = true;
sai->synchronous[TX] = false;
- sai->cpu_dai_drv.symmetric_rates = 1;
+ sai->cpu_dai_drv.symmetric_rate = 1;
sai->cpu_dai_drv.symmetric_channels = 1;
- sai->cpu_dai_drv.symmetric_samplebits = 1;
+ sai->cpu_dai_drv.symmetric_sample_bits = 1;
if (of_find_property(np, "fsl,sai-synchronous-rx", NULL) &&
of_find_property(np, "fsl,sai-asynchronous", NULL)) {
@@ -1098,9 +1098,9 @@ static int fsl_sai_probe(struct platform_device *pdev)
/* Discard all settings for asynchronous mode */
sai->synchronous[RX] = false;
sai->synchronous[TX] = false;
- sai->cpu_dai_drv.symmetric_rates = 0;
+ sai->cpu_dai_drv.symmetric_rate = 0;
sai->cpu_dai_drv.symmetric_channels = 0;
- sai->cpu_dai_drv.symmetric_samplebits = 0;
+ sai->cpu_dai_drv.symmetric_sample_bits = 0;
}
if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 404be27c15fe..41d10f7e7411 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1537,9 +1537,9 @@ static int fsl_ssi_probe(struct platform_device *pdev)
/* Set software limitations for synchronous mode except AC97 */
if (ssi->synchronous && !fsl_ssi_is_ac97(ssi)) {
- ssi->cpu_dai_drv.symmetric_rates = 1;
+ ssi->cpu_dai_drv.symmetric_rate = 1;
ssi->cpu_dai_drv.symmetric_channels = 1;
- ssi->cpu_dai_drv.symmetric_samplebits = 1;
+ ssi->cpu_dai_drv.symmetric_sample_bits = 1;
}
/*
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 16/44] ASoC: wm*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (14 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 15/44] ASoC: fsl: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 17/44] ASoC: tlv*: " Kuninori Morimoto
` (28 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/wm5102.c | 12 ++++++------
sound/soc/codecs/wm5110.c | 12 ++++++------
sound/soc/codecs/wm8510.c | 2 +-
sound/soc/codecs/wm8731.c | 2 +-
sound/soc/codecs/wm8770.c | 2 +-
sound/soc/codecs/wm8804.c | 2 +-
sound/soc/codecs/wm8903.c | 2 +-
sound/soc/codecs/wm8904.c | 2 +-
sound/soc/codecs/wm8940.c | 2 +-
sound/soc/codecs/wm8960.c | 2 +-
sound/soc/codecs/wm8962.c | 2 +-
sound/soc/codecs/wm8974.c | 2 +-
sound/soc/codecs/wm8978.c | 2 +-
sound/soc/codecs/wm8983.c | 2 +-
sound/soc/codecs/wm8985.c | 2 +-
sound/soc/codecs/wm8988.c | 2 +-
sound/soc/codecs/wm8993.c | 2 +-
sound/soc/codecs/wm8994.c | 4 ++--
sound/soc/codecs/wm8997.c | 8 ++++----
sound/soc/codecs/wm8998.c | 12 ++++++------
sound/soc/codecs/wm9713.c | 2 +-
21 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 70d353b63fe0..fe33f2d88f55 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1780,8 +1780,8 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
.formats = WM5102_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm5102-aif2",
@@ -1802,8 +1802,8 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
.formats = WM5102_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm5102-aif3",
@@ -1824,8 +1824,8 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
.formats = WM5102_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm5102-slim1",
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 4238929b2375..52c0a575cc4f 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2089,8 +2089,8 @@ static struct snd_soc_dai_driver wm5110_dai[] = {
.formats = WM5110_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm5110-aif2",
@@ -2111,8 +2111,8 @@ static struct snd_soc_dai_driver wm5110_dai[] = {
.formats = WM5110_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm5110-aif3",
@@ -2133,8 +2133,8 @@ static struct snd_soc_dai_driver wm5110_dai[] = {
.formats = WM5110_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm5110-slim1",
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 73c4a8b9f59e..a18e2290b8c8 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -569,7 +569,7 @@ static struct snd_soc_dai_driver wm8510_dai = {
.rates = WM8510_RATES,
.formats = WM8510_FORMATS,},
.ops = &wm8510_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8510_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 304bf725a613..dcee7b2bd3d7 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -567,7 +567,7 @@ static struct snd_soc_dai_driver wm8731_dai = {
.rates = WM8731_RATES,
.formats = WM8731_FORMATS,},
.ops = &wm8731_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8731_request_supplies(struct device *dev,
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index 1176a6ad269d..5f394065030d 100644
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -562,7 +562,7 @@ static struct snd_soc_dai_driver wm8770_dai = {
.formats = WM8770_FORMATS
},
.ops = &wm8770_dai_ops,
- .symmetric_rates = 1
+ .symmetric_rate = 1
};
static int wm8770_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 4ddb5e32df5d..21bf0cfa1e7e 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -536,7 +536,7 @@ static struct snd_soc_dai_driver wm8804_dai = {
.formats = WM8804_FORMATS,
},
.ops = &wm8804_dai_ops,
- .symmetric_rates = 1
+ .symmetric_rate = 1
};
static const struct snd_soc_component_driver soc_component_dev_wm8804 = {
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 09f4980630c7..026603ae44ce 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1760,7 +1760,7 @@ static struct snd_soc_dai_driver wm8903_dai = {
.formats = WM8903_FORMATS,
},
.ops = &wm8903_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8903_resume(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 1c360bae5652..a02a77fef360 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1983,7 +1983,7 @@ static struct snd_soc_dai_driver wm8904_dai = {
.formats = WM8904_FORMATS,
},
.ops = &wm8904_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static void wm8904_handle_retune_mobile_pdata(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 016cd8aeef37..440d048ef0c0 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -688,7 +688,7 @@ static struct snd_soc_dai_driver wm8940_dai = {
.formats = WM8940_FORMATS,
},
.ops = &wm8940_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8940_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 660ec46eecf2..df351519a3a6 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -1338,7 +1338,7 @@ static struct snd_soc_dai_driver wm8960_dai = {
.rates = WM8960_RATES,
.formats = WM8960_FORMATS,},
.ops = &wm8960_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8960_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 3af456010b9c..ce4666a74793 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2973,7 +2973,7 @@ static struct snd_soc_dai_driver wm8962_dai = {
.formats = WM8962_FORMATS,
},
.ops = &wm8962_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static void wm8962_mic_work(struct work_struct *work)
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index c86231dfcf4f..fdc68ab49742 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -643,7 +643,7 @@ static struct snd_soc_dai_driver wm8974_dai = {
.rates = WM8974_RATES,
.formats = WM8974_FORMATS,},
.ops = &wm8974_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct regmap_config wm8974_regmap = {
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index a7acb8981715..4b5ecd142249 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -918,7 +918,7 @@ static struct snd_soc_dai_driver wm8978_dai = {
.formats = WM8978_FORMATS,
},
.ops = &wm8978_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8978_suspend(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index d1d2d408ad95..d8ed22a9caac 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -971,7 +971,7 @@ static struct snd_soc_dai_driver wm8983_dai = {
.formats = WM8983_FORMATS,
},
.ops = &wm8983_dai_ops,
- .symmetric_rates = 1
+ .symmetric_rate = 1
};
static const struct snd_soc_component_driver soc_component_dev_wm8983 = {
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 3f27482349b2..a7e01106fbc0 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -1100,7 +1100,7 @@ static struct snd_soc_dai_driver wm8985_dai = {
.formats = WM8985_FORMATS,
},
.ops = &wm8985_dai_ops,
- .symmetric_rates = 1
+ .symmetric_rate = 1
};
static const struct snd_soc_component_driver soc_component_dev_wm8985 = {
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index d2c2d0d943f0..1d2f881bbcae 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -787,7 +787,7 @@ static struct snd_soc_dai_driver wm8988_dai = {
.formats = WM8988_FORMATS,
},
.ops = &wm8988_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8988_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 9f310082e3c1..c4f41692b806 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1476,7 +1476,7 @@ static struct snd_soc_dai_driver wm8993_dai = {
.sig_bits = 24,
},
.ops = &wm8993_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int wm8993_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index f57884113406..f117ec0c489f 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -4351,7 +4351,7 @@ static int wm8994_component_probe(struct snd_soc_component *component)
}
if ((reg & WM8994_GPN_FN_MASK) != WM8994_GP_FN_PIN_SPECIFIC) {
wm8994->lrclk_shared[0] = 1;
- wm8994_dai[0].symmetric_rates = 1;
+ wm8994_dai[0].symmetric_rate = 1;
} else {
wm8994->lrclk_shared[0] = 0;
}
@@ -4363,7 +4363,7 @@ static int wm8994_component_probe(struct snd_soc_component *component)
}
if ((reg & WM8994_GPN_FN_MASK) != WM8994_GP_FN_PIN_SPECIFIC) {
wm8994->lrclk_shared[1] = 1;
- wm8994_dai[1].symmetric_rates = 1;
+ wm8994_dai[1].symmetric_rate = 1;
} else {
wm8994->lrclk_shared[1] = 0;
}
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 229f2986cd96..99c3ebae6ba6 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -969,8 +969,8 @@ static struct snd_soc_dai_driver wm8997_dai[] = {
.formats = WM8997_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm8997-aif2",
@@ -991,8 +991,8 @@ static struct snd_soc_dai_driver wm8997_dai[] = {
.formats = WM8997_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm8997-slim1",
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index 5413254295b7..b6f717aa5478 100644
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -1161,8 +1161,8 @@ static struct snd_soc_dai_driver wm8998_dai[] = {
.formats = WM8998_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm8998-aif2",
@@ -1183,8 +1183,8 @@ static struct snd_soc_dai_driver wm8998_dai[] = {
.formats = WM8998_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm8998-aif3",
@@ -1205,8 +1205,8 @@ static struct snd_soc_dai_driver wm8998_dai[] = {
.formats = WM8998_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "wm8998-slim1",
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index f333e2ff4a16..e0ce32dd4a81 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1134,7 +1134,7 @@ static struct snd_soc_dai_driver wm9713_dai[] = {
.rates = WM9713_PCM_RATES,
.formats = WM9713_PCM_FORMATS,},
.ops = &wm9713_dai_ops_voice,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 17/44] ASoC: tlv*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (15 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 16/44] ASoC: wm*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 18/44] ASoC: rt*: " Kuninori Morimoto
` (27 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/tlv320adcx140.c | 2 +-
sound/soc/codecs/tlv320aic31xx.c | 4 ++--
sound/soc/codecs/tlv320aic32x4.c | 2 +-
sound/soc/codecs/tlv320aic3x.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c
index 3f027c8234a6..32b120d624b2 100644
--- a/sound/soc/codecs/tlv320adcx140.c
+++ b/sound/soc/codecs/tlv320adcx140.c
@@ -1069,7 +1069,7 @@ static struct snd_soc_dai_driver adcx140_dai_driver[] = {
.formats = ADCX140_FORMATS,
},
.ops = &adcx140_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 5ac7ce264431..51870d50f419 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1395,7 +1395,7 @@ static struct snd_soc_dai_driver dac31xx_dai_driver[] = {
.formats = AIC31XX_FORMATS,
},
.ops = &aic31xx_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
@@ -1417,7 +1417,7 @@ static struct snd_soc_dai_driver aic31xx_dai_driver[] = {
.formats = AIC31XX_FORMATS,
},
.ops = &aic31xx_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index 9e3de9ded0ef..f04f88c8d425 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -916,7 +916,7 @@ static struct snd_soc_dai_driver aic32x4_dai = {
.rates = AIC32X4_RATES,
.formats = AIC32X4_FORMATS,},
.ops = &aic32x4_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static void aic32x4_setup_gpios(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 6d066bc58ac8..db1444127444 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1503,7 +1503,7 @@ static struct snd_soc_dai_driver aic3x_dai = {
.rates = AIC3X_RATES,
.formats = AIC3X_FORMATS,},
.ops = &aic3x_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static void aic3x_mono_init(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 18/44] ASoC: rt*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (16 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 17/44] ASoC: tlv*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 19/44] ASoC: nau*: " Kuninori Morimoto
` (26 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/rt274.c | 2 +-
sound/soc/codecs/rt286.c | 4 ++--
sound/soc/codecs/rt298.c | 4 ++--
sound/soc/codecs/rt5670.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c
index 70cf17c0aa99..0d3773c576f8 100644
--- a/sound/soc/codecs/rt274.c
+++ b/sound/soc/codecs/rt274.c
@@ -1056,7 +1056,7 @@ static struct snd_soc_dai_driver rt274_dai[] = {
.formats = RT274_FORMATS,
},
.ops = &rt274_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 5fb9653d9131..8abe232ca4a4 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -1017,7 +1017,7 @@ static struct snd_soc_dai_driver rt286_dai[] = {
.formats = RT286_FORMATS,
},
.ops = &rt286_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "rt286-aif2",
@@ -1037,7 +1037,7 @@ static struct snd_soc_dai_driver rt286_dai[] = {
.formats = RT286_FORMATS,
},
.ops = &rt286_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
index dc0273a5a11f..32cc9b6287d2 100644
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@ -1084,7 +1084,7 @@ static struct snd_soc_dai_driver rt298_dai[] = {
.formats = RT298_FORMATS,
},
.ops = &rt298_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "rt298-aif2",
@@ -1104,7 +1104,7 @@ static struct snd_soc_dai_driver rt298_dai[] = {
.formats = RT298_FORMATS,
},
.ops = &rt298_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index a0c8f58d729b..c29317ea5df2 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -2741,7 +2741,7 @@ static struct snd_soc_dai_driver rt5670_dai[] = {
.formats = RT5670_FORMATS,
},
.ops = &rt5670_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "rt5670-aif2",
@@ -2761,7 +2761,7 @@ static struct snd_soc_dai_driver rt5670_dai[] = {
.formats = RT5670_FORMATS,
},
.ops = &rt5670_aif_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 19/44] ASoC: nau*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (17 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 18/44] ASoC: rt*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 20/44] ASoC: tas*: " Kuninori Morimoto
` (25 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/nau8810.c | 2 +-
sound/soc/codecs/nau8822.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/nau8810.c b/sound/soc/codecs/nau8810.c
index 33ebc6398426..13676b544f58 100644
--- a/sound/soc/codecs/nau8810.c
+++ b/sound/soc/codecs/nau8810.c
@@ -837,7 +837,7 @@ static struct snd_soc_dai_driver nau8810_dai = {
.formats = NAU8810_FORMATS,
},
.ops = &nau8810_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct regmap_config nau8810_regmap_config = {
diff --git a/sound/soc/codecs/nau8822.c b/sound/soc/codecs/nau8822.c
index 609aeeb27818..58123390c7a3 100644
--- a/sound/soc/codecs/nau8822.c
+++ b/sound/soc/codecs/nau8822.c
@@ -991,7 +991,7 @@ static struct snd_soc_dai_driver nau8822_dai = {
.formats = NAU8822_FORMATS,
},
.ops = &nau8822_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int nau8822_suspend(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 20/44] ASoC: tas*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (18 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 19/44] ASoC: nau*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 21/44] ASoC: da*: " Kuninori Morimoto
` (24 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/tas2764.c | 2 +-
sound/soc/codecs/tas2770.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c
index 14a193e48dc7..8ff4d9e8d568 100644
--- a/sound/soc/codecs/tas2764.c
+++ b/sound/soc/codecs/tas2764.c
@@ -490,7 +490,7 @@ static struct snd_soc_dai_driver tas2764_dai_driver[] = {
.formats = TAS2764_FORMATS,
},
.ops = &tas2764_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c
index a91a0a31e74d..15fca5109e14 100644
--- a/sound/soc/codecs/tas2770.c
+++ b/sound/soc/codecs/tas2770.c
@@ -499,7 +499,7 @@ static struct snd_soc_dai_driver tas2770_dai_driver[] = {
.formats = TAS2770_FORMATS,
},
.ops = &tas2770_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 21/44] ASoC: da*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (19 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 20/44] ASoC: tas*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 22/44] ASoC: es*: " Kuninori Morimoto
` (23 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/da7210.c | 2 +-
sound/soc/codecs/da7213.c | 2 +-
sound/soc/codecs/da7218.c | 4 ++--
sound/soc/codecs/da7219.c | 4 ++--
sound/soc/codecs/da9055.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 3d05c37f676e..8af344b2fdbf 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -1059,7 +1059,7 @@ static struct snd_soc_dai_driver da7210_dai = {
.formats = DA7210_FORMATS,
},
.ops = &da7210_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int da7210_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 72402467adcc..3ab89387b4e6 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1551,7 +1551,7 @@ static struct snd_soc_dai_driver da7213_dai = {
.formats = DA7213_FORMATS,
},
.ops = &da7213_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int da7213_set_auto_pll(struct snd_soc_component *component, bool enable)
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c
index 2bfafbe9e3dc..0e5b91eb420b 100644
--- a/sound/soc/codecs/da7218.c
+++ b/sound/soc/codecs/da7218.c
@@ -2194,9 +2194,9 @@ static struct snd_soc_dai_driver da7218_dai = {
.formats = DA7218_FORMATS,
},
.ops = &da7218_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
};
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index e9b45daec0ca..13009d08b09a 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1692,9 +1692,9 @@ static struct snd_soc_dai_driver da7219_dai = {
.formats = DA7219_FORMATS,
},
.ops = &da7219_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
};
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c
index aed92f615b02..a9676b261129 100644
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
@@ -1347,7 +1347,7 @@ static struct snd_soc_dai_driver da9055_dai = {
.formats = DA9055_FORMATS,
},
.ops = &da9055_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int da9055_set_bias_level(struct snd_soc_component *component,
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 22/44] ASoC: es*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (20 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 21/44] ASoC: da*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 23/44] ASoC: max*: " Kuninori Morimoto
` (22 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/es8316.c | 2 +-
sound/soc/codecs/es8328.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 1ce84f12a4cf..d632055370e0 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -543,7 +543,7 @@ static struct snd_soc_dai_driver es8316_dai = {
.formats = ES8316_FORMATS,
},
.ops = &es8316_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static void es8316_enable_micbias_for_mic_gnd_short_detect(
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index b537300d0ce8..9632afc2d4d6 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -715,7 +715,7 @@ static struct snd_soc_dai_driver es8328_dai = {
.formats = ES8328_FORMATS,
},
.ops = &es8328_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int es8328_suspend(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 23/44] ASoC: max*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (21 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 22/44] ASoC: es*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 24/44] ASoC: cs*: " Kuninori Morimoto
` (21 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/max9860.c | 2 +-
sound/soc/codecs/max9867.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c
index d5925c42b4b5..dd29b183ecd6 100644
--- a/sound/soc/codecs/max9860.c
+++ b/sound/soc/codecs/max9860.c
@@ -489,7 +489,7 @@ static struct snd_soc_dai_driver max9860_dai = {
SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &max9860_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int max9860_set_bias_level(struct snd_soc_component *component,
diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index 512e6f2513d3..09b2d730e9fd 100644
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -520,7 +520,7 @@ static struct snd_soc_dai_driver max9867_dai[] = {
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.ops = &max9867_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 24/44] ASoC: cs*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (22 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 23/44] ASoC: max*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 25/44] ASoC: tscs*: " Kuninori Morimoto
` (20 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/cs35l32.c | 2 +-
sound/soc/codecs/cs35l33.c | 2 +-
sound/soc/codecs/cs35l34.c | 2 +-
sound/soc/codecs/cs35l35.c | 2 +-
sound/soc/codecs/cs35l36.c | 2 +-
sound/soc/codecs/cs4234.c | 2 +-
sound/soc/codecs/cs4271.c | 2 +-
sound/soc/codecs/cs42l73.c | 6 +++---
sound/soc/codecs/cs43130.c | 6 +++---
sound/soc/codecs/cs4341.c | 2 +-
sound/soc/codecs/cs4349.c | 2 +-
sound/soc/codecs/cs47l15.c | 12 ++++++------
sound/soc/codecs/cs47l24.c | 12 ++++++------
sound/soc/codecs/cs47l35.c | 12 ++++++------
sound/soc/codecs/cs47l85.c | 16 ++++++++--------
sound/soc/codecs/cs47l90.c | 16 ++++++++--------
sound/soc/codecs/cs47l92.c | 12 ++++++------
sound/soc/codecs/cs53l30.c | 2 +-
18 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 3a644a35c464..f4067230ac42 100644
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -194,7 +194,7 @@ static struct snd_soc_dai_driver cs35l32_dai[] = {
.formats = CS35L32_FORMATS,
},
.ops = &cs35l32_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
index 6042194d95d3..7ad7b733af9b 100644
--- a/sound/soc/codecs/cs35l33.c
+++ b/sound/soc/codecs/cs35l33.c
@@ -691,7 +691,7 @@ static struct snd_soc_dai_driver cs35l33_dai = {
.formats = CS35L33_FORMATS,
},
.ops = &cs35l33_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int cs35l33_set_hg_data(struct snd_soc_component *component,
diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c
index b792c006e530..110ee2d06358 100644
--- a/sound/soc/codecs/cs35l34.c
+++ b/sound/soc/codecs/cs35l34.c
@@ -666,7 +666,7 @@ static struct snd_soc_dai_driver cs35l34_dai = {
.formats = CS35L34_FORMATS,
},
.ops = &cs35l34_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34,
diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c
index e330427a4314..55d529aa0011 100644
--- a/sound/soc/codecs/cs35l35.c
+++ b/sound/soc/codecs/cs35l35.c
@@ -692,7 +692,7 @@ static struct snd_soc_dai_driver cs35l35_dai[] = {
.formats = CS35L35_FORMATS,
},
.ops = &cs35l35_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "cs35l35-pdm",
diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c
index e9b5f76f27a8..4451ca9f4916 100644
--- a/sound/soc/codecs/cs35l36.c
+++ b/sound/soc/codecs/cs35l36.c
@@ -995,7 +995,7 @@ static struct snd_soc_dai_driver cs35l36_dai[] = {
.formats = CS35L36_TX_FORMATS,
},
.ops = &cs35l36_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/cs4234.c b/sound/soc/codecs/cs4234.c
index 2ea83233c3f1..20126cc675b1 100644
--- a/sound/soc/codecs/cs4234.c
+++ b/sound/soc/codecs/cs4234.c
@@ -585,7 +585,7 @@ static struct snd_soc_dai_driver cs4234_dai[] = {
.formats = CS4234_FORMATS,
},
.ops = &cs4234_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index d43762ae8f3d..7663f89ac6a2 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -481,7 +481,7 @@ static struct snd_soc_dai_driver cs4271_dai = {
.formats = CS4271_PCM_FORMATS,
},
.ops = &cs4271_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int cs4271_reset(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 988ca7e19821..c3f974ec78e5 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1181,7 +1181,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
.formats = CS42L73_FORMATS,
},
.ops = &cs42l73_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "cs42l73-asp",
@@ -1201,7 +1201,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
.formats = CS42L73_FORMATS,
},
.ops = &cs42l73_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "cs42l73-vsp",
@@ -1221,7 +1221,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
.formats = CS42L73_FORMATS,
},
.ops = &cs42l73_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c
index 7fb34422a2a4..80bc7c10ed75 100644
--- a/sound/soc/codecs/cs43130.c
+++ b/sound/soc/codecs/cs43130.c
@@ -1581,7 +1581,7 @@ static struct snd_soc_dai_driver cs43130_dai[] = {
.formats = CS43130_PCM_FORMATS,
},
.ops = &cs43130_pcm_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "cs43130-asp-dop",
@@ -1594,7 +1594,7 @@ static struct snd_soc_dai_driver cs43130_dai[] = {
.formats = CS43130_DOP_FORMATS,
},
.ops = &cs43130_dop_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "cs43130-xsp-dop",
@@ -1607,7 +1607,7 @@ static struct snd_soc_dai_driver cs43130_dai[] = {
.formats = CS43130_DOP_FORMATS,
},
.ops = &cs43130_dop_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "cs43130-xsp-dsd",
diff --git a/sound/soc/codecs/cs4341.c b/sound/soc/codecs/cs4341.c
index f566604de78c..7d3e54d8eef3 100644
--- a/sound/soc/codecs/cs4341.c
+++ b/sound/soc/codecs/cs4341.c
@@ -189,7 +189,7 @@ static struct snd_soc_dai_driver cs4341_dai = {
SNDRV_PCM_FMTBIT_S24_LE,
},
.ops = &cs4341_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver soc_component_cs4341 = {
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index fd5526319779..786c69a8ec4a 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -250,7 +250,7 @@ static struct snd_soc_dai_driver cs4349_dai = {
.formats = CS4349_PCM_FORMATS,
},
.ops = &cs4349_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver soc_component_dev_cs4349 = {
diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c
index 254f9d96e766..1ee83160b83f 100644
--- a/sound/soc/codecs/cs47l15.c
+++ b/sound/soc/codecs/cs47l15.c
@@ -1160,8 +1160,8 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l15-aif2",
@@ -1182,8 +1182,8 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l15-aif3",
@@ -1204,8 +1204,8 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l15-cpu-trace",
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index f6d173d0120e..eaabbb56a173 100644
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -977,8 +977,8 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
.formats = CS47L24_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l24-aif2",
@@ -999,8 +999,8 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
.formats = CS47L24_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l24-aif3",
@@ -1021,8 +1021,8 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
.formats = CS47L24_FORMATS,
},
.ops = &arizona_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l24-cpu-voicectrl",
diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c
index e967609da8a3..3f04a2a74521 100644
--- a/sound/soc/codecs/cs47l35.c
+++ b/sound/soc/codecs/cs47l35.c
@@ -1368,8 +1368,8 @@ static struct snd_soc_dai_driver cs47l35_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l35-aif2",
@@ -1390,8 +1390,8 @@ static struct snd_soc_dai_driver cs47l35_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l35-aif3",
@@ -1412,8 +1412,8 @@ static struct snd_soc_dai_driver cs47l35_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l35-slim1",
diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c
index 47b16466b6c1..748a180870bc 100644
--- a/sound/soc/codecs/cs47l85.c
+++ b/sound/soc/codecs/cs47l85.c
@@ -2269,8 +2269,8 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l85-aif2",
@@ -2291,8 +2291,8 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l85-aif3",
@@ -2313,8 +2313,8 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l85-aif4",
@@ -2335,8 +2335,8 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l85-slim1",
diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c
index 8838dd557321..d2911c014b86 100644
--- a/sound/soc/codecs/cs47l90.c
+++ b/sound/soc/codecs/cs47l90.c
@@ -2188,8 +2188,8 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l90-aif2",
@@ -2210,8 +2210,8 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l90-aif3",
@@ -2232,8 +2232,8 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l90-aif4",
@@ -2254,8 +2254,8 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l90-slim1",
diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c
index 52dc29942ec2..1a0280416d92 100644
--- a/sound/soc/codecs/cs47l92.c
+++ b/sound/soc/codecs/cs47l92.c
@@ -1704,8 +1704,8 @@ static struct snd_soc_dai_driver cs47l92_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l92-aif2",
@@ -1726,8 +1726,8 @@ static struct snd_soc_dai_driver cs47l92_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l92-aif3",
@@ -1748,8 +1748,8 @@ static struct snd_soc_dai_driver cs47l92_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "cs47l92-slim1",
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index ed22361b35c1..3d67cbf9eaaa 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -869,7 +869,7 @@ static struct snd_soc_dai_driver cs53l30_dai = {
.formats = CS53L30_FORMATS,
},
.ops = &cs53l30_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int cs53l30_component_probe(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 25/44] ASoC: tscs*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (23 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 24/44] ASoC: cs*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 26/44] ASoC: ak*: " Kuninori Morimoto
` (19 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/tscs42xx.c | 4 ++--
sound/soc/codecs/tscs454.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c
index 6200fab7896f..fb861baf50e8 100644
--- a/sound/soc/codecs/tscs42xx.c
+++ b/sound/soc/codecs/tscs42xx.c
@@ -1397,9 +1397,9 @@ static struct snd_soc_dai_driver tscs42xx_dai = {
.rates = TSCS42XX_RATES,
.formats = TSCS42XX_FORMATS,},
.ops = &tscs42xx_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
};
static const struct reg_sequence tscs42xx_patch[] = {
diff --git a/sound/soc/codecs/tscs454.c b/sound/soc/codecs/tscs454.c
index cd1f1a592386..1bafc9d1101c 100644
--- a/sound/soc/codecs/tscs454.c
+++ b/sound/soc/codecs/tscs454.c
@@ -3346,9 +3346,9 @@ static struct snd_soc_dai_driver tscs454_dais[] = {
.rates = TSCS454_RATES,
.formats = TSCS454_FORMATS,},
.ops = &tscs454_dai1_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "tscs454-dai2",
@@ -3366,9 +3366,9 @@ static struct snd_soc_dai_driver tscs454_dais[] = {
.rates = TSCS454_RATES,
.formats = TSCS454_FORMATS,},
.ops = &tscs454_dai23_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
},
{
.name = "tscs454-dai3",
@@ -3386,9 +3386,9 @@ static struct snd_soc_dai_driver tscs454_dais[] = {
.rates = TSCS454_RATES,
.formats = TSCS454_FORMATS,},
.ops = &tscs454_dai23_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 26/44] ASoC: ak*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (24 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 25/44] ASoC: tscs*: " Kuninori Morimoto
@ 2021-01-15 4:54 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 27/44] ASoC: adau*: " Kuninori Morimoto
` (18 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/ak4554.c | 2 +-
sound/soc/codecs/ak4613.c | 2 +-
sound/soc/codecs/ak4641.c | 4 ++--
sound/soc/codecs/ak4642.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/ak4554.c b/sound/soc/codecs/ak4554.c
index 2fa83a1a84cf..8e60e2b56ad6 100644
--- a/sound/soc/codecs/ak4554.c
+++ b/sound/soc/codecs/ak4554.c
@@ -56,7 +56,7 @@ static struct snd_soc_dai_driver ak4554_dai = {
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver soc_component_dev_ak4554 = {
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 8d663e8d64c4..fe208cfdd3ba 100644
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -575,7 +575,7 @@ static struct snd_soc_dai_driver ak4613_dai = {
.formats = AK4613_PCM_FMTBIT,
},
.ops = &ak4613_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int ak4613_suspend(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 77004cd7caa3..04aef0e72aa5 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -499,7 +499,7 @@ static struct snd_soc_dai_driver ak4641_dai[] = {
.formats = AK4641_FORMATS,
},
.ops = &ak4641_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "ak4641-voice",
@@ -519,7 +519,7 @@ static struct snd_soc_dai_driver ak4641_dai[] = {
.formats = AK4641_FORMATS,
},
.ops = &ak4641_pcm_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 353237025514..c49c58eeb476 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -516,7 +516,7 @@ static struct snd_soc_dai_driver ak4642_dai = {
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE },
.ops = &ak4642_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int ak4642_suspend(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 27/44] ASoC: adau*: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (25 preceding siblings ...)
2021-01-15 4:54 ` [PATCH 26/44] ASoC: ak*: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 28/44] ASoC: jz4740: " Kuninori Morimoto
` (17 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/adau1372.c | 2 +-
sound/soc/codecs/adau1373.c | 6 +++---
sound/soc/codecs/adau1701.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/adau1372.c b/sound/soc/codecs/adau1372.c
index 5ccbf1b6bcf5..6811a8b3866d 100644
--- a/sound/soc/codecs/adau1372.c
+++ b/sound/soc/codecs/adau1372.c
@@ -890,7 +890,7 @@ static struct snd_soc_dai_driver adau1372_dai_driver = {
.sig_bits = 24,
},
.ops = &adau1372_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int adau1372_setup_pll(struct adau1372 *adau1372, unsigned int rate)
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index e71fde001b46..9887aa6f0be5 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -1205,7 +1205,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
.formats = ADAU1373_FORMATS,
},
.ops = &adau1373_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.id = 1,
@@ -1225,7 +1225,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
.formats = ADAU1373_FORMATS,
},
.ops = &adau1373_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.id = 2,
@@ -1245,7 +1245,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
.formats = ADAU1373_FORMATS,
},
.ops = &adau1373_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index 68130eaa64a4..5ce74697564a 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -653,7 +653,7 @@ static struct snd_soc_dai_driver adau1701_dai = {
.formats = ADAU1701_FORMATS,
},
.ops = &adau1701_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
#ifdef CONFIG_OF
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 28/44] ASoC: jz4740: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (26 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 27/44] ASoC: adau*: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 29/44] ASoC: sunxi: " Kuninori Morimoto
` (16 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/jz4740.c | 2 +-
sound/soc/jz4740/jz4740-i2s.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index 5e58bfee2b49..081485f784e9 100644
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -214,7 +214,7 @@ static struct snd_soc_dai_driver jz4740_codec_dai = {
.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8,
},
.ops = &jz4740_codec_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static void jz4740_codec_wakeup(struct regmap *regmap)
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 0a68f4c3d15a..52ba0e3a9e95 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -455,7 +455,7 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = JZ4740_I2S_FMTS,
},
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.ops = &jz4740_i2s_dai_ops,
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 29/44] ASoC: sunxi: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (27 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 28/44] ASoC: jz4740: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 30/44] ASoC: zl38060: " Kuninori Morimoto
` (15 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sunxi/sun4i-i2s.c | 2 +-
sound/soc/sunxi/sun8i-codec.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 4b8ca5be0a29..78506c3811dc 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1105,7 +1105,7 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = {
.formats = SUN4I_FORMATS,
},
.ops = &sun4i_i2s_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static const struct snd_soc_component_driver sun4i_i2s_component = {
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 180442c62be1..460924fc173f 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -640,9 +640,9 @@ static struct snd_soc_dai_driver sun8i_codec_dais[] = {
.rates = SUN8I_CODEC_PCM_RATES,
.formats = SUN8I_CODEC_PCM_FORMATS,
},
- .symmetric_rates = true,
+ .symmetric_rate = true,
.symmetric_channels = true,
- .symmetric_samplebits = true,
+ .symmetric_sample_bits = true,
},
{
.name = "sun8i-codec-aif2",
@@ -665,9 +665,9 @@ static struct snd_soc_dai_driver sun8i_codec_dais[] = {
.rates = SUN8I_CODEC_PCM_RATES,
.formats = SUN8I_CODEC_PCM_FORMATS,
},
- .symmetric_rates = true,
+ .symmetric_rate = true,
.symmetric_channels = true,
- .symmetric_samplebits = true,
+ .symmetric_sample_bits = true,
},
{
.name = "sun8i-codec-aif3",
@@ -690,9 +690,9 @@ static struct snd_soc_dai_driver sun8i_codec_dais[] = {
.rates = SUN8I_CODEC_PCM_RATES,
.formats = SUN8I_CODEC_PCM_FORMATS,
},
- .symmetric_rates = true,
+ .symmetric_rate = true,
.symmetric_channels = true,
- .symmetric_samplebits = true,
+ .symmetric_sample_bits = true,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 30/44] ASoC: zl38060: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (28 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 29/44] ASoC: sunxi: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 31/44] ASoC: ssm2602: " Kuninori Morimoto
` (14 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/zl38060.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/zl38060.c b/sound/soc/codecs/zl38060.c
index 42726dc0ba39..d21a72314d37 100644
--- a/sound/soc/codecs/zl38060.c
+++ b/sound/soc/codecs/zl38060.c
@@ -360,8 +360,8 @@ static struct snd_soc_dai_driver zl38_dai = {
.formats = ZL38_FORMATS,
},
.ops = &zl38_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
.symmetric_channels = 1,
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 31/44] ASoC: ssm2602: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (29 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 30/44] ASoC: zl38060: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 32/44] ASoC: sgtl5000: " Kuninori Morimoto
` (13 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/ssm2602.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 905160246614..7964e922b07f 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -526,8 +526,8 @@ static struct snd_soc_dai_driver ssm2602_dai = {
.rates = SSM2602_RATES,
.formats = SSM2602_FORMATS,},
.ops = &ssm2602_dai_ops,
- .symmetric_rates = 1,
- .symmetric_samplebits = 1,
+ .symmetric_rate = 1,
+ .symmetric_sample_bits = 1,
};
static int ssm2602_resume(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 32/44] ASoC: sgtl5000: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (30 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 31/44] ASoC: ssm2602: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 33/44] ASoC: mc13783: " Kuninori Morimoto
` (12 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/sgtl5000.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 4d6ff8114622..73551e36695e 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1187,7 +1187,7 @@ static struct snd_soc_dai_driver sgtl5000_dai = {
.formats = SGTL5000_FORMATS,
},
.ops = &sgtl5000_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static bool sgtl5000_volatile(struct device *dev, unsigned int reg)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 33/44] ASoC: mc13783: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (31 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 32/44] ASoC: sgtl5000: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 34/44] ASoC: mt6660: " Kuninori Morimoto
` (11 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/mc13783.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index 9e6a0cda43d0..a21072503cb9 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -712,7 +712,7 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = {
.formats = MC13783_FORMATS,
},
.ops = &mc13783_ops_sync,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
}
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 34/44] ASoC: mt6660: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (32 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 33/44] ASoC: mc13783: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 35/44] ASoC: lochnagar-sc: " Kuninori Morimoto
` (10 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/mt6660.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/mt6660.c b/sound/soc/codecs/mt6660.c
index d1797003c83d..358c500377df 100644
--- a/sound/soc/codecs/mt6660.c
+++ b/sound/soc/codecs/mt6660.c
@@ -404,9 +404,9 @@ static struct snd_soc_dai_driver mt6660_codec_dai = {
.formats = STUB_FORMATS,
},
/* dai properties */
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
.symmetric_channels = 1,
- .symmetric_samplebits = 1,
+ .symmetric_sample_bits = 1,
/* dai operations */
.ops = &mt6660_component_aif_ops,
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 35/44] ASoC: lochnagar-sc: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (33 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 34/44] ASoC: mt6660: " Kuninori Morimoto
@ 2021-01-15 4:55 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 36/44] ASoC: ab8500: " Kuninori Morimoto
` (9 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/lochnagar-sc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/lochnagar-sc.c b/sound/soc/codecs/lochnagar-sc.c
index 3209b39e46af..54426a90bc0b 100644
--- a/sound/soc/codecs/lochnagar-sc.c
+++ b/sound/soc/codecs/lochnagar-sc.c
@@ -166,8 +166,8 @@ static struct snd_soc_dai_driver lochnagar_sc_dai[] = {
.formats = SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &lochnagar_sc_line_ops,
- .symmetric_rates = true,
- .symmetric_samplebits = true,
+ .symmetric_rate = true,
+ .symmetric_sample_bits = true,
},
{
.name = "lochnagar-usb1",
@@ -186,8 +186,8 @@ static struct snd_soc_dai_driver lochnagar_sc_dai[] = {
.formats = SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &lochnagar_sc_usb_ops,
- .symmetric_rates = true,
- .symmetric_samplebits = true,
+ .symmetric_rate = true,
+ .symmetric_sample_bits = true,
},
{
.name = "lochnagar-usb2",
@@ -206,8 +206,8 @@ static struct snd_soc_dai_driver lochnagar_sc_dai[] = {
.formats = SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &lochnagar_sc_usb_ops,
- .symmetric_rates = true,
- .symmetric_samplebits = true,
+ .symmetric_rate = true,
+ .symmetric_sample_bits = true,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 36/44] ASoC: ab8500: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (34 preceding siblings ...)
2021-01-15 4:55 ` [PATCH 35/44] ASoC: lochnagar-sc: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 37/44] ASoC: alc5632: " Kuninori Morimoto
` (8 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/ab8500-codec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 31a8c4162d20..c95f007cede1 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2384,7 +2384,7 @@ static struct snd_soc_dai_driver ab8500_codec_dai[] = {
.formats = AB8500_SUPPORTED_FMT,
},
.ops = &ab8500_codec_ops,
- .symmetric_rates = 1
+ .symmetric_rate = 1
},
{
.name = "ab8500-codec-dai.1",
@@ -2397,7 +2397,7 @@ static struct snd_soc_dai_driver ab8500_codec_dai[] = {
.formats = AB8500_SUPPORTED_FMT,
},
.ops = &ab8500_codec_ops,
- .symmetric_rates = 1
+ .symmetric_rate = 1
}
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 37/44] ASoC: alc5632: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (35 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 36/44] ASoC: ab8500: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 38/44] ASoC: cx2072x: " Kuninori Morimoto
` (7 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/alc5632.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index bde5ded67754..79813882a955 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -1032,7 +1032,7 @@ static struct snd_soc_dai_driver alc5632_dai = {
.formats = ALC5632_FORMATS,},
.ops = &alc5632_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
#ifdef CONFIG_PM
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 38/44] ASoC: cx2072x: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (36 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 37/44] ASoC: alc5632: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 39/44] ASoC: inno_rk3036: " Kuninori Morimoto
` (6 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/cx2072x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c
index 2f10991a8bdb..8ab22815c2c9 100644
--- a/sound/soc/codecs/cx2072x.c
+++ b/sound/soc/codecs/cx2072x.c
@@ -1572,7 +1572,7 @@ static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = {
.formats = CX2072X_FORMATS,
},
.ops = &cx2072x_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{ /* plabayck only, return echo reference to Conexant DSP chip */
.name = "cx2072x-dsp",
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 39/44] ASoC: inno_rk3036: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (37 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 38/44] ASoC: cx2072x: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 40/44] ASoC: lm49453: " Kuninori Morimoto
` (5 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/inno_rk3036.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/inno_rk3036.c b/sound/soc/codecs/inno_rk3036.c
index 4dbce24c5f76..e05c4f27486e 100644
--- a/sound/soc/codecs/inno_rk3036.c
+++ b/sound/soc/codecs/inno_rk3036.c
@@ -325,7 +325,7 @@ static struct snd_soc_dai_driver rk3036_codec_dai_driver[] = {
.formats = RK3036_CODEC_FMTS,
},
.ops = &rk3036_codec_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 40/44] ASoC: lm49453: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (38 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 39/44] ASoC: inno_rk3036: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 41/44] ASoC: ml26124: " Kuninori Morimoto
` (4 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/lm49453.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 06ab61f6f719..eb3dd0bd80d9 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -1343,7 +1343,7 @@ static struct snd_soc_dai_driver lm49453_dai[] = {
.formats = LM49453_FORMATS,
},
.ops = &lm49453_headset_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
},
{
.name = "LM49453 Speaker",
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 41/44] ASoC: ml26124: sync parameter naming (rate/sample_bits)
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (39 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 40/44] ASoC: lm49453: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 42/44] ASoC: soc-dai.h: remove symmetric_rates/samplebits Kuninori Morimoto
` (3 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch syncs naming rule.
- xxx_rates;
+ xxx_rate;
- xxx_samplebits;
+ xxx_sample_bits;
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/codecs/ml26124.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c
index 70c17be455ca..4d7c0be2a4aa 100644
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
@@ -513,7 +513,7 @@ static struct snd_soc_dai_driver ml26124_dai = {
.rates = ML26124_RATES,
.formats = ML26124_FORMATS,},
.ops = &ml26124_dai_ops,
- .symmetric_rates = 1,
+ .symmetric_rate = 1,
};
static int ml26124_probe(struct snd_soc_component *component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 42/44] ASoC: soc-dai.h: remove symmetric_rates/samplebits
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (40 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 41/44] ASoC: ml26124: " Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 43/44] ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry() Kuninori Morimoto
` (2 subsequent siblings)
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
All drivers are using new name.
Let's remove old one.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc-dai.h | 2 --
sound/soc/soc-core.c | 9 ---------
2 files changed, 11 deletions(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index ee3c6deb5719..1358a0ceb4d0 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -353,10 +353,8 @@ struct snd_soc_dai_driver {
/* DAI capabilities */
struct snd_soc_pcm_stream capture;
struct snd_soc_pcm_stream playback;
- unsigned int symmetric_rates:1; /* will be removed */
unsigned int symmetric_rate:1;
unsigned int symmetric_channels:1;
- unsigned int symmetric_samplebits:1; /* will be removed */
unsigned int symmetric_sample_bits:1;
/* probe ordering - for components with runtime dependencies */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bb8323cad51a..f6d4e99b590c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2509,15 +2509,6 @@ int snd_soc_register_component(struct device *dev,
{
struct snd_soc_component *component;
int ret;
- int i;
-
- /* Remove ME */
- for (i = 0; i < num_dai; i++) {
- if (dai_drv[i].symmetric_rates)
- dai_drv[i].symmetric_rate = dai_drv[i].symmetric_rates;
- if (dai_drv[i].symmetric_samplebits)
- dai_drv[i].symmetric_sample_bits = dai_drv[i].symmetric_samplebits;
- }
component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL);
if (!component)
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 43/44] ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry()
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (41 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 42/44] ASoC: soc-dai.h: remove symmetric_rates/samplebits Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 44/44] ASoC: soc-pcm: cleanup soc_pcm_params_symmetry() Kuninori Morimoto
2021-01-21 19:39 ` [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Mark Brown
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
soc_pcm_apply_symmetry() want to call snd_pcm_hw_constraint_single()
for rate/channel/sample_bits, but, it needs many condition checks.
These are very similar but different, thus, it needs to have very
verbose code.
This patch use macro for it and make code more simple.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 67 ++++++++++++++-------------------------------
1 file changed, 20 insertions(+), 47 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 1a5d0cb3dc69..57341a0fd67c 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -349,53 +349,26 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
int ret;
- if (soc_dai->rate && (soc_dai->driver->symmetric_rate ||
- rtd->dai_link->symmetric_rate)) {
- dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %dHz rate\n",
- soc_dai->rate);
-
- ret = snd_pcm_hw_constraint_single(substream->runtime,
- SNDRV_PCM_HW_PARAM_RATE,
- soc_dai->rate);
- if (ret < 0) {
- dev_err(soc_dai->dev,
- "ASoC: Unable to apply rate constraint: %d\n",
- ret);
- return ret;
- }
- }
-
- if (soc_dai->channels && (soc_dai->driver->symmetric_channels ||
- rtd->dai_link->symmetric_channels)) {
- dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d channel(s)\n",
- soc_dai->channels);
-
- ret = snd_pcm_hw_constraint_single(substream->runtime,
- SNDRV_PCM_HW_PARAM_CHANNELS,
- soc_dai->channels);
- if (ret < 0) {
- dev_err(soc_dai->dev,
- "ASoC: Unable to apply channel symmetry constraint: %d\n",
- ret);
- return ret;
- }
- }
-
- if (soc_dai->sample_bits && (soc_dai->driver->symmetric_sample_bits ||
- rtd->dai_link->symmetric_sample_bits)) {
- dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d sample bits\n",
- soc_dai->sample_bits);
-
- ret = snd_pcm_hw_constraint_single(substream->runtime,
- SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
- soc_dai->sample_bits);
- if (ret < 0) {
- dev_err(soc_dai->dev,
- "ASoC: Unable to apply sample bits symmetry constraint: %d\n",
- ret);
- return ret;
- }
- }
+#define __soc_pcm_apply_symmetry(name, NAME) \
+ if (soc_dai->name && (soc_dai->driver->symmetric_##name || \
+ rtd->dai_link->symmetric_##name)) { \
+ dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %s to %d\n",\
+ #name, soc_dai->name); \
+ \
+ ret = snd_pcm_hw_constraint_single(substream->runtime, \
+ SNDRV_PCM_HW_PARAM_##NAME,\
+ soc_dai->name); \
+ if (ret < 0) { \
+ dev_err(soc_dai->dev, \
+ "ASoC: Unable to apply %s constraint: %d\n",\
+ #name, ret); \
+ return ret; \
+ } \
+ }
+
+ __soc_pcm_apply_symmetry(rate, RATE);
+ __soc_pcm_apply_symmetry(channels, CHANNELS);
+ __soc_pcm_apply_symmetry(sample_bits, SAMPLE_BITS);
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 44/44] ASoC: soc-pcm: cleanup soc_pcm_params_symmetry()
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (42 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 43/44] ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry() Kuninori Morimoto
@ 2021-01-15 4:56 ` Kuninori Morimoto
2021-01-21 19:39 ` [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Mark Brown
44 siblings, 0 replies; 46+ messages in thread
From: Kuninori Morimoto @ 2021-01-15 4:56 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
soc_pcm_params_symmetry() checks rate/channel/sample_bits state.
These are very similar but different, thus, it needs to have very
verbose code.
This patch use macro for it and make code more simple.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 60 ++++++++++++---------------------------------
1 file changed, 15 insertions(+), 45 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 57341a0fd67c..7079a301ec31 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -384,53 +384,23 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream,
soc_pcm_set_dai_params(&d, params);
- /* reject unmatched parameters when applying symmetry */
- symmetry = rtd->dai_link->symmetric_rate;
-
- for_each_rtd_cpu_dais(rtd, i, dai)
- symmetry |= dai->driver->symmetric_rate;
-
- if (symmetry) {
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (cpu_dai->rate && cpu_dai->rate != d.rate) {
- dev_err(rtd->dev, "ASoC: unmatched rate symmetry: %d - %d\n",
- cpu_dai->rate, d.rate);
- return -EINVAL;
- }
- }
- }
-
- symmetry = rtd->dai_link->symmetric_channels;
-
- for_each_rtd_dais(rtd, i, dai)
- symmetry |= dai->driver->symmetric_channels;
-
- if (symmetry) {
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (cpu_dai->channels &&
- cpu_dai->channels != d.channels) {
- dev_err(rtd->dev, "ASoC: unmatched channel symmetry: %d - %d\n",
- cpu_dai->channels, d.channels);
- return -EINVAL;
+#define __soc_pcm_params_symmetry(name) \
+ symmetry = rtd->dai_link->symmetric_##name; \
+ for_each_rtd_dais(rtd, i, dai) \
+ symmetry |= dai->driver->symmetric_##name; \
+ \
+ if (symmetry) \
+ for_each_rtd_cpu_dais(rtd, i, cpu_dai) \
+ if (cpu_dai->name && cpu_dai->name != d.name) { \
+ dev_err(rtd->dev, "ASoC: unmatched %s symmetry: %d - %d\n", \
+ #name, cpu_dai->name, d.name); \
+ return -EINVAL; \
}
- }
- }
- symmetry = rtd->dai_link->symmetric_sample_bits;
-
- for_each_rtd_dais(rtd, i, dai)
- symmetry |= dai->driver->symmetric_sample_bits;
-
- if (symmetry) {
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (cpu_dai->sample_bits &&
- cpu_dai->sample_bits != d.sample_bits) {
- dev_err(rtd->dev, "ASoC: unmatched sample bits symmetry: %d - %d\n",
- cpu_dai->sample_bits, d.sample_bits);
- return -EINVAL;
- }
- }
- }
+ /* reject unmatched parameters when applying symmetry */
+ __soc_pcm_params_symmetry(rate);
+ __soc_pcm_params_symmetry(channels);
+ __soc_pcm_params_symmetry(sample_bits);
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* Re: [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
` (43 preceding siblings ...)
2021-01-15 4:56 ` [PATCH 44/44] ASoC: soc-pcm: cleanup soc_pcm_params_symmetry() Kuninori Morimoto
@ 2021-01-21 19:39 ` Mark Brown
44 siblings, 0 replies; 46+ messages in thread
From: Mark Brown @ 2021-01-21 19:39 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA
On 15 Jan 2021 13:51:56 +0900, Kuninori Morimoto wrote:
> snd_pcm_runtime / snd_soc_dai / snd_soc_dai_driver / snd_soc_dai_link
> have related parameter which is similar but not same naming.
>
> struct snd_pcm_runtime {
> ...
> (A) unsigned int rate;
> ...
> (B) unsigned int sample_bits;
> ...
> };
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/44] ASoC: soc-pcm: revert soc_pcm_apply_symmetry()
commit: 80f454e283708c28f5220eda68511fc495e5ffaf
[02/44] ASoC: sync parameter naming : rate / sample_bits
commit: f14654ddf2e982537ab476d392a87fcbf90374c3
[03/44] ASoC: adi: sync parameter naming (rate/sample_bits)
commit: 55d0056ba6a1bc8be2ae804cadf106ff2ae712ca
[04/44] ASoC: atmel: sync parameter naming (rate/sample_bits)
commit: ba471f8d1655753bd1fad226a1c47ffc4568c02e
[05/44] ASoC: au1x: sync parameter naming (rate/sample_bits)
commit: 3470c2398ce9f6e80a5434c1c8649b036544a1d4
[06/44] ASoC: bcm: sync parameter naming (rate/sample_bits)
commit: a8e940222bdf60b9957515e80064b1230a3fc774
[07/44] ASoC: cirrus: sync parameter naming (rate/sample_bits)
commit: f1e6b04baba690e3bd08669c73e8d78032c2b905
[08/44] ASoC: tegra: sync parameter naming (rate/sample_bits)
commit: c6d152a8de560f50a37e9580b7550dc2001eaccf
[09/44] ASoC: rockchip: sync parameter naming (rate/sample_bits)
commit: fadaed3023138197000d37c2fafe15b2208ec9bc
[10/44] ASoC: samsung: sync parameter naming (rate/sample_bits)
commit: d11ff0bf6ac1a85fcf51f4ca52934b0fb6ac47a6
[11/44] ASoC: sh: sync parameter naming (rate/sample_bits)
commit: f1cd5f3bbcef13980734ea18797f192c344d850e
[12/44] ASoC: ti: sync parameter naming (rate/sample_bits)
commit: c756316f0027a8659562d7df76fb24a9ff7c2068
[13/44] ASoC: pxa: sync parameter naming (rate/sample_bits)
commit: c658b2185818ac39ca5b71001f30ab14a517219a
[14/44] ASoC: mediatek: sync parameter naming (rate/sample_bits)
commit: 4b7ead032ecd1b1af5ce0dfbc2479cfdee7063b3
[15/44] ASoC: fsl: sync parameter naming (rate/sample_bits)
commit: cb2f6927faf44d0cd3e55d3f9a9211f2aad26850
[16/44] ASoC: wm*: sync parameter naming (rate/sample_bits)
commit: 0769575294e4c965cc2a4f4817fa696e20c2c05f
[17/44] ASoC: tlv*: sync parameter naming (rate/sample_bits)
commit: a9aef184f7b47c355e4d78aa08792ff74fd5c4f5
[18/44] ASoC: rt*: sync parameter naming (rate/sample_bits)
commit: bc03b3910ef6e228ef8b192e08030a1e177ad273
[19/44] ASoC: nau*: sync parameter naming (rate/sample_bits)
commit: 42c9b5bec1c5218b33eda3b519381b38b89d5ccd
[20/44] ASoC: tas*: sync parameter naming (rate/sample_bits)
commit: fa056c07367e443271837c8500de8c7e6d9b2722
[21/44] ASoC: da*: sync parameter naming (rate/sample_bits)
commit: 1c6d1c4f6874345a31d12a9f3843876c49d637fa
[22/44] ASoC: es*: sync parameter naming (rate/sample_bits)
commit: 4060064e8baf047a64b6286f5fd87cb0a34d8b89
[23/44] ASoC: max*: sync parameter naming (rate/sample_bits)
commit: cb40d1b4581c0f6e2a828ebfcb7cc9a04dca1e11
[24/44] ASoC: cs*: sync parameter naming (rate/sample_bits)
commit: 260b668cf356dbab5f73e651cfc96a90ed220b98
[25/44] ASoC: tscs*: sync parameter naming (rate/sample_bits)
commit: 9b4488efdeccbe1d4dceb13aee9e58371f6ba926
[26/44] ASoC: ak*: sync parameter naming (rate/sample_bits)
commit: 870b76ea7d0c0e5d6e5f305d8eca9ba45b89241a
[27/44] ASoC: adau*: sync parameter naming (rate/sample_bits)
commit: f88f45861bbd5da303a997f92800fa0d7958c929
[28/44] ASoC: jz4740: sync parameter naming (rate/sample_bits)
commit: 0547dece8dcbb80983b3c37ad20ceca76a1f06a5
[29/44] ASoC: sunxi: sync parameter naming (rate/sample_bits)
commit: 813857086191aace3a39c056c8acb6946ff75f03
[30/44] ASoC: zl38060: sync parameter naming (rate/sample_bits)
commit: b33c088a9b0b15df987dae05177ef9b0816dc4cf
[31/44] ASoC: ssm2602: sync parameter naming (rate/sample_bits)
commit: 4735c8cadd54ef74726718ad93a27d16b23089b0
[32/44] ASoC: sgtl5000: sync parameter naming (rate/sample_bits)
commit: bea17630c4ad398b6cd9b454c1649a962a7e0258
[33/44] ASoC: mc13783: sync parameter naming (rate/sample_bits)
commit: 23df7f69ff134d108ddffcde622b7ffc904ac789
[34/44] ASoC: mt6660: sync parameter naming (rate/sample_bits)
commit: 852d4daa9689188f25cd1aa92d4daf3a88d73101
[35/44] ASoC: lochnagar-sc: sync parameter naming (rate/sample_bits)
commit: 65ba325625e74f44fe7c0052a85bcdfac2b012ec
[36/44] ASoC: ab8500: sync parameter naming (rate/sample_bits)
commit: 6058bcb4974418bdec55738383755b83e57e555e
[37/44] ASoC: alc5632: sync parameter naming (rate/sample_bits)
commit: 278eacf3dc717f27463d56d605c2ea919e308e49
[38/44] ASoC: cx2072x: sync parameter naming (rate/sample_bits)
commit: 15d27c2b129fc8234ed709bdcbd17fa3fff0808e
[39/44] ASoC: inno_rk3036: sync parameter naming (rate/sample_bits)
commit: d5d396c8b01e1fea696c68d255c2d7206de6499f
[40/44] ASoC: lm49453: sync parameter naming (rate/sample_bits)
commit: 3b940ecd2ebfdd9a2b4a7a97aef1f25d1844d3ba
[41/44] ASoC: ml26124: sync parameter naming (rate/sample_bits)
commit: 6944db0ab8c4b7c19b7ff9fbbe98322efcd9595a
[42/44] ASoC: soc-dai.h: remove symmetric_rates/samplebits
commit: fa31a2c787aeaf61d02b2a57bd9765ca5e67d949
[43/44] ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry()
commit: fac110cbcddec115c7d4b79d7491aebebbe44469
[44/44] ASoC: soc-pcm: cleanup soc_pcm_params_symmetry()
commit: 3a906721112263f1698d7752f6f0133c78fc12c2
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 46+ messages in thread
end of thread, other threads:[~2021-01-21 19:42 UTC | newest]
Thread overview: 46+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-15 4:51 [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 01/44] ASoC: soc-pcm: revert soc_pcm_apply_symmetry() Kuninori Morimoto
2021-01-15 4:52 ` [PATCH 02/44] ASoC: sync parameter naming : rate / sample_bits Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 03/44] ASoC: adi: sync parameter naming (rate/sample_bits) Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 04/44] ASoC: atmel: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 05/44] ASoC: au1x: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 06/44] ASoC: bcm: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 07/44] ASoC: cirrus: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 08/44] ASoC: tegra: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 09/44] ASoC: rockchip: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 10/44] ASoC: samsung: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 11/44] ASoC: sh: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 12/44] ASoC: ti: " Kuninori Morimoto
2021-01-15 4:53 ` [PATCH 13/44] ASoC: pxa: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 14/44] ASoC: mediatek: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 15/44] ASoC: fsl: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 16/44] ASoC: wm*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 17/44] ASoC: tlv*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 18/44] ASoC: rt*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 19/44] ASoC: nau*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 20/44] ASoC: tas*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 21/44] ASoC: da*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 22/44] ASoC: es*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 23/44] ASoC: max*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 24/44] ASoC: cs*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 25/44] ASoC: tscs*: " Kuninori Morimoto
2021-01-15 4:54 ` [PATCH 26/44] ASoC: ak*: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 27/44] ASoC: adau*: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 28/44] ASoC: jz4740: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 29/44] ASoC: sunxi: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 30/44] ASoC: zl38060: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 31/44] ASoC: ssm2602: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 32/44] ASoC: sgtl5000: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 33/44] ASoC: mc13783: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 34/44] ASoC: mt6660: " Kuninori Morimoto
2021-01-15 4:55 ` [PATCH 35/44] ASoC: lochnagar-sc: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 36/44] ASoC: ab8500: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 37/44] ASoC: alc5632: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 38/44] ASoC: cx2072x: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 39/44] ASoC: inno_rk3036: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 40/44] ASoC: lm49453: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 41/44] ASoC: ml26124: " Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 42/44] ASoC: soc-dai.h: remove symmetric_rates/samplebits Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 43/44] ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry() Kuninori Morimoto
2021-01-15 4:56 ` [PATCH 44/44] ASoC: soc-pcm: cleanup soc_pcm_params_symmetry() Kuninori Morimoto
2021-01-21 19:39 ` [PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.