ASoC: Intel: sof_sdw: use generic name for controls/widgets

Some controls and widgets have exactly the same items. Rename them to be
generic. This is a preparation for further cleanup. No function change.

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240509163418.67746-15-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c
index b999f4e7901a5d67a203819fec8f9a78898a530f..82555c53a9c9e4829a8642b97e75d0b99d0fe56a 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l42.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c
@@ -17,7 +17,7 @@
 #include <sound/jack.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget cs42l42_widgets[] = {
+static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
        SND_SOC_DAPM_HP("Headphone", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
 };
@@ -30,7 +30,7 @@ static const struct snd_soc_dapm_route cs42l42_map[] = {
        {"cs42l42 HS", NULL, "Headset Mic"},
 };
 
-static const struct snd_kcontrol_new cs42l42_controls[] = {
+static const struct snd_kcontrol_new generic_jack_controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
 };
@@ -70,15 +70,15 @@ int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, cs42l42_controls,
-                                       ARRAY_SIZE(cs42l42_controls));
+       ret = snd_soc_add_card_controls(card, generic_jack_controls,
+                                       ARRAY_SIZE(generic_jack_controls));
        if (ret) {
                dev_err(card->dev, "cs42l42 control addition failed: %d\n", ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, cs42l42_widgets,
-                                       ARRAY_SIZE(cs42l42_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
+                                       ARRAY_SIZE(generic_jack_widgets));
        if (ret) {
                dev_err(card->dev, "cs42l42 widgets addition failed: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l43.c b/sound/soc/intel/boards/sof_sdw_cs42l43.c
index 0fd5e099bb1a79c5e52a9c9c315bbf4d84f39597..f76a16795fda608645dd6bcacae6ae771247be40 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l43.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l43.c
@@ -18,7 +18,7 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget cs42l43_hs_widgets[] = {
+static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
        SND_SOC_DAPM_HP("Headphone", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
 };
@@ -30,7 +30,7 @@ static const struct snd_soc_dapm_route cs42l43_hs_map[] = {
        { "cs42l43 ADC1_IN1_N", NULL, "Headset Mic" },
 };
 
-static const struct snd_soc_dapm_widget cs42l43_spk_widgets[] = {
+static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
        SND_SOC_DAPM_SPK("Speaker", NULL),
 };
 
@@ -41,7 +41,7 @@ static const struct snd_soc_dapm_route cs42l43_spk_map[] = {
        { "Speaker", NULL, "cs42l43 AMP2_OUT_N", },
 };
 
-static const struct snd_soc_dapm_widget cs42l43_dmic_widgets[] = {
+static const struct snd_soc_dapm_widget generic_dmic_widgets[] = {
        SND_SOC_DAPM_MIC("DMIC", NULL),
 };
 
@@ -74,8 +74,8 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_hs_widgets,
-                                       ARRAY_SIZE(cs42l43_hs_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
+                                       ARRAY_SIZE(generic_jack_widgets));
        if (ret) {
                dev_err(card->dev, "cs42l43 hs widgets addition failed: %d\n", ret);
                return ret;
@@ -133,8 +133,8 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
                        return -ENOMEM;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_spk_widgets,
-                                       ARRAY_SIZE(cs42l43_spk_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
+                                       ARRAY_SIZE(generic_spk_widgets));
        if (ret) {
                dev_err(card->dev, "cs42l43 speaker widgets addition failed: %d\n", ret);
                return ret;
@@ -172,8 +172,8 @@ int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_dmic_widgets,
-                                       ARRAY_SIZE(cs42l43_dmic_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_dmic_widgets,
+                                       ARRAY_SIZE(generic_dmic_widgets));
        if (ret) {
                dev_err(card->dev, "cs42l43 dmic widgets addition failed: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_cs_amp.c b/sound/soc/intel/boards/sof_sdw_cs_amp.c
index 3538d3c752b78af1b6dafc5670857fb0cd3fd601..e15a4753f103e42cf501751e60da809df83beb45 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_cs_amp.c
@@ -14,7 +14,7 @@
 
 #define CODEC_NAME_SIZE        8
 
-static const struct snd_soc_dapm_widget sof_widgets[] = {
+static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
        SND_SOC_DAPM_SPK("Speaker", NULL),
 };
 
@@ -35,8 +35,8 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, sof_widgets,
-                                       ARRAY_SIZE(sof_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
+                                       ARRAY_SIZE(generic_spk_widgets));
        if (ret) {
                dev_err(card->dev, "widgets addition failed: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_rt5682.c b/sound/soc/intel/boards/sof_sdw_rt5682.c
index f812aea64322d8549c1e3b9663312db7fad0241e..9fbe36322a835a2d680df31f0ed7da91e914a282 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt5682.c
+++ b/sound/soc/intel/boards/sof_sdw_rt5682.c
@@ -17,7 +17,7 @@
 #include <sound/jack.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget rt5682_widgets[] = {
+static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
        SND_SOC_DAPM_HP("Headphone", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
 };
@@ -29,7 +29,7 @@ static const struct snd_soc_dapm_route rt5682_map[] = {
        { "rt5682 IN1P", NULL, "Headset Mic" },
 };
 
-static const struct snd_kcontrol_new rt5682_controls[] = {
+static const struct snd_kcontrol_new generic_jack_controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
 };
@@ -69,15 +69,15 @@ int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, rt5682_controls,
-                                       ARRAY_SIZE(rt5682_controls));
+       ret = snd_soc_add_card_controls(card, generic_jack_controls,
+                                       ARRAY_SIZE(generic_jack_controls));
        if (ret) {
                dev_err(card->dev, "rt5682 control addition failed: %d\n", ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt5682_widgets,
-                                       ARRAY_SIZE(rt5682_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
+                                       ARRAY_SIZE(generic_jack_widgets));
        if (ret) {
                dev_err(card->dev, "rt5682 widgets addition failed: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c
index 7e54fc5cbe097bfcd5a2b24ce9590b29c400f829..1a0f6692034ab5492fbaf8da08bb4b3f6702d179 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt711.c
+++ b/sound/soc/intel/boards/sof_sdw_rt711.c
@@ -42,7 +42,7 @@ static int rt711_add_codec_device_props(struct device *sdw_dev)
        return ret;
 }
 
-static const struct snd_soc_dapm_widget rt711_widgets[] = {
+static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
        SND_SOC_DAPM_HP("Headphone", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
 };
@@ -53,7 +53,7 @@ static const struct snd_soc_dapm_route rt711_map[] = {
        { "rt711 MIC2", NULL, "Headset Mic" },
 };
 
-static const struct snd_kcontrol_new rt711_controls[] = {
+static const struct snd_kcontrol_new generic_jack_controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
 };
@@ -93,15 +93,15 @@ int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, rt711_controls,
-                                       ARRAY_SIZE(rt711_controls));
+       ret = snd_soc_add_card_controls(card, generic_jack_controls,
+                                       ARRAY_SIZE(generic_jack_controls));
        if (ret) {
                dev_err(card->dev, "rt711 controls addition failed: %d\n", ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt711_widgets,
-                                       ARRAY_SIZE(rt711_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
+                                       ARRAY_SIZE(generic_jack_widgets));
        if (ret) {
                dev_err(card->dev, "rt711 widgets addition failed: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
index 0c4cd4cdbd45b686ce33c95e5badf74c5d59d5ee..42308228c634bb4dc30af0a1ddaacfe404b6d13d 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
@@ -15,7 +15,7 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget rt712_spk_widgets[] = {
+static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
        SND_SOC_DAPM_SPK("Speaker", NULL),
 };
 
@@ -30,7 +30,7 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
        { "Speaker", NULL, "rt712 SPOR" },
 };
 
-static const struct snd_kcontrol_new rt712_spk_controls[] = {
+static const struct snd_kcontrol_new generic_spk_controls[] = {
        SOC_DAPM_PIN_SWITCH("Speaker"),
 };
 
@@ -45,15 +45,15 @@ int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, rt712_spk_controls,
-                                       ARRAY_SIZE(rt712_spk_controls));
+       ret = snd_soc_add_card_controls(card, generic_spk_controls,
+                                       ARRAY_SIZE(generic_spk_controls));
        if (ret) {
                dev_err(card->dev, "rt712 spk controls addition failed: %d\n", ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt712_spk_widgets,
-                                       ARRAY_SIZE(rt712_spk_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
+                                       ARRAY_SIZE(generic_spk_widgets));
        if (ret) {
                dev_err(card->dev, "rt712 spk widgets addition failed: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
index e5c2a36e400b864d077491a67812a0fa2e513274..1653e45a0f7d60ef9e3cd12f48678ded37e7a19b 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
@@ -15,7 +15,7 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget rt722_spk_widgets[] = {
+static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
        SND_SOC_DAPM_SPK("Speaker", NULL),
 };
 
@@ -23,7 +23,7 @@ static const struct snd_soc_dapm_route rt722_spk_map[] = {
        { "Speaker", NULL, "rt722 SPK" },
 };
 
-static const struct snd_kcontrol_new rt722_spk_controls[] = {
+static const struct snd_kcontrol_new generic_spk_controls[] = {
        SOC_DAPM_PIN_SWITCH("Speaker"),
 };
 
@@ -38,15 +38,15 @@ int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, rt722_spk_controls,
-                                       ARRAY_SIZE(rt722_spk_controls));
+       ret = snd_soc_add_card_controls(card, generic_spk_controls,
+                                       ARRAY_SIZE(generic_spk_controls));
        if (ret) {
                dev_err(card->dev, "failed to add rt722 spk controls: %d\n", ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt722_spk_widgets,
-                                       ARRAY_SIZE(rt722_spk_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
+                                       ARRAY_SIZE(generic_spk_widgets));
        if (ret) {
                dev_err(card->dev, "failed to add rt722 spk widgets: %d\n", ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_rt_amp.c b/sound/soc/intel/boards/sof_sdw_rt_amp.c
index 1b415708500e354568a6321820ffef09cead5eb9..03e0978e6a88ef7781277a3bcf7e7935feae33ee 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_amp.c
@@ -131,12 +131,12 @@ static int rt_amp_add_device_props(struct device *sdw_dev)
        return ret;
 }
 
-static const struct snd_kcontrol_new rt_amp_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
+static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
+       SND_SOC_DAPM_SPK("Speaker", NULL),
 };
 
-static const struct snd_soc_dapm_widget rt_amp_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
+static const struct snd_kcontrol_new generic_spk_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Speaker"),
 };
 
 /*
@@ -202,15 +202,15 @@ int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, rt_amp_controls,
-                                       ARRAY_SIZE(rt_amp_controls));
+       ret = snd_soc_add_card_controls(card, generic_spk_controls,
+                                       ARRAY_SIZE(generic_spk_controls));
        if (ret) {
                dev_err(card->dev, "%s controls addition failed: %d\n", codec_name, ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt_amp_widgets,
-                                       ARRAY_SIZE(rt_amp_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
+                                       ARRAY_SIZE(generic_spk_widgets));
        if (ret) {
                dev_err(card->dev, "%s widgets addition failed: %d\n", codec_name, ret);
                return ret;

diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
index 69161ea5b290a547f861e0ca63b7a5fb9daa867b..932fba8ccf9a00967a5b63cd65c1f2c79d0dc04e 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
@@ -43,7 +43,7 @@ static int rt_sdca_jack_add_codec_device_props(struct device *sdw_dev)
        return ret;
 }
 
-static const struct snd_soc_dapm_widget rt_sdca_jack_widgets[] = {
+static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
        SND_SOC_DAPM_HP("Headphone", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
 };
@@ -68,7 +68,7 @@ static const struct snd_soc_dapm_route rt722_sdca_map[] = {
        { "rt722 MIC2", NULL, "Headset Mic" },
 };
 
-static const struct snd_kcontrol_new rt_sdca_jack_controls[] = {
+static const struct snd_kcontrol_new generic_jack_controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
 };
@@ -129,15 +129,15 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd)
                }
        }
 
-       ret = snd_soc_add_card_controls(card, rt_sdca_jack_controls,
-                                       ARRAY_SIZE(rt_sdca_jack_controls));
+       ret = snd_soc_add_card_controls(card, generic_jack_controls,
+                                       ARRAY_SIZE(generic_jack_controls));
        if (ret) {
                dev_err(card->dev, "rt sdca jack controls addition failed: %d\n", ret);
                return ret;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt_sdca_jack_widgets,
-                                       ARRAY_SIZE(rt_sdca_jack_widgets));
+       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
+                                       ARRAY_SIZE(generic_jack_widgets));
        if (ret) {
                dev_err(card->dev, "rt sdca jack widgets addition failed: %d\n", ret);
                return ret;