ASoC: wm*: sync parameter naming (rate/sample_bits)

This patch syncs naming rule.

 - xxx_rates;
 + xxx_rate;

 - xxx_samplebits;
 + xxx_sample_bits;

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87czy6olh0.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 70d353b63fe034e3cac9914346747e60bb116eca..fe33f2d88f557c0dd1c132131cf98f03ff763fd3 100644 (file)
--- 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 4238929b237510a41d96fae7dc97d4e5becb36cb..52c0a575cc4f62c1f9e25ae72b57ec65080a1f01 100644 (file)
--- 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 73c4a8b9f59e333bff00e7f45e2149c934e8e27f..a18e2290b8c8896c11bddd485b68b5e07deeb420 100644 (file)
--- 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 304bf725a6132524731db01f0931f6207c1cafa6..dcee7b2bd3d79decf5cf3daf2f3498ab0ee0ea14 100644 (file)
--- 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 1176a6ad269d4eadc8268f6e9b701f4f40592c0b..5f394065030d27ceaeed4efb0d0e3eeafc6e600f 100644 (file)
--- 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 4ddb5e32df5df23f29e3ed5569ddc6771e9098c3..21bf0cfa1e7e7ca625394d084d34a287a795b6e8 100644 (file)
--- 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 09f4980630c7e9cefadfa2e125324576ce3bc2c6..026603ae44ce0f5415cb2daf0e6eea6d54c7235b 100644 (file)
--- 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 1c360bae5652c56fa8f954c1a30dca603ec36a5c..a02a77fef360ba1436d8ee28d5f51f2ade1342aa 100644 (file)
--- 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 016cd8aeef37c6892715f5680f96519d7eab243a..440d048ef0c02c6cd73572da0636c4dcee2477f5 100644 (file)
--- 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 660ec46eecf2588d7a277c8ff4a2b63a67242145..df351519a3a6bd4efcef1c5b94ea2dbb0b57020c 100644 (file)
--- 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 3af456010b9c59e0f3cde623d648ab12bb5e59f2..ce4666a74793e35884e67dc6724bf36ab3246f01 100644 (file)
--- 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 c86231dfcf4f84d68cf127addfe704c203b4bab8..fdc68ab4974274d9fea2a1b84a276f5bd24eb33c 100644 (file)
--- 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 a7acb898171592cad66d75f73628b767cae1448a..4b5ecd1422492705089d50e296b845dd559dbd6e 100644 (file)
--- 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 d1d2d408ad952fd8f7ad63c0243ad70bac43acf2..d8ed22a9caac1ae8c4daa64bd30ae47b19ae05c4 100644 (file)
--- 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 3f27482349b2a36438bd7e1d8406d386f84a6a95..a7e01106fbc0a18afb6631369c03b1b9af8a8ea7 100644 (file)
--- 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 d2c2d0d943f09ecc408ad00fd81f77d667d6d3de..1d2f881bbcae6bb72a619d3237b205012ad4e27a 100644 (file)
--- 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 9f310082e3c1a0653df367bc6a8ae128a53b0b07..c4f41692b806d72aacafe0d8196cd663595a8115 100644 (file)
--- 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 f57884113406b8f180252b09b6629a3481b0c507..f117ec0c489f03af6f5d20bee93f8ff7a68cad09 100644 (file)
--- 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 229f2986cd96b22ffaeadd1630783aa12c0453d8..99c3ebae6ba698e5516a75ede9610e78e0d10495 100644 (file)
--- 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 5413254295b70dfe608fd39f31eb521fb63aefd2..b6f717aa5478a29299654e9077a678a90d251f13 100644 (file)
--- 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 f333e2ff4a168960829c8bd6317e06fe7c0977f9..e0ce32dd4a811517828278f5b803ecb20169981a 100644 (file)
--- 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,
        },
 };