Skip to content

Commit 01c266a

Browse files
bardliaobroonie
bardliao
authored and
broonie
committed
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>
1 parent 1628e1c commit 01c266a

9 files changed

Lines changed: 56 additions & 56 deletions

‎sound/soc/intel/boards/sof_sdw_cs42l42.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <sound/jack.h>
1818
#include "sof_sdw_common.h"
1919

20-
static const struct snd_soc_dapm_widget cs42l42_widgets[] = {
20+
static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
2121
SND_SOC_DAPM_HP("Headphone", NULL),
2222
SND_SOC_DAPM_MIC("Headset Mic", NULL),
2323
};
@@ -30,7 +30,7 @@ static const struct snd_soc_dapm_route cs42l42_map[] = {
3030
{"cs42l42 HS", NULL, "Headset Mic"},
3131
};
3232

33-
static const struct snd_kcontrol_new cs42l42_controls[] = {
33+
static const struct snd_kcontrol_new generic_jack_controls[] = {
3434
SOC_DAPM_PIN_SWITCH("Headphone"),
3535
SOC_DAPM_PIN_SWITCH("Headset Mic"),
3636
};
@@ -70,15 +70,15 @@ int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)
7070
if (!card->components)
7171
return -ENOMEM;
7272

73-
ret = snd_soc_add_card_controls(card, cs42l42_controls,
74-
ARRAY_SIZE(cs42l42_controls));
73+
ret = snd_soc_add_card_controls(card, generic_jack_controls,
74+
ARRAY_SIZE(generic_jack_controls));
7575
if (ret) {
7676
dev_err(card->dev, "cs42l42 control addition failed: %d\n", ret);
7777
return ret;
7878
}
7979

80-
ret = snd_soc_dapm_new_controls(&card->dapm, cs42l42_widgets,
81-
ARRAY_SIZE(cs42l42_widgets));
80+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
81+
ARRAY_SIZE(generic_jack_widgets));
8282
if (ret) {
8383
dev_err(card->dev, "cs42l42 widgets addition failed: %d\n", ret);
8484
return ret;

‎sound/soc/intel/boards/sof_sdw_cs42l43.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <sound/soc-dapm.h>
1919
#include "sof_sdw_common.h"
2020

21-
static const struct snd_soc_dapm_widget cs42l43_hs_widgets[] = {
21+
static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
2222
SND_SOC_DAPM_HP("Headphone", NULL),
2323
SND_SOC_DAPM_MIC("Headset Mic", NULL),
2424
};
@@ -30,7 +30,7 @@ static const struct snd_soc_dapm_route cs42l43_hs_map[] = {
3030
{ "cs42l43 ADC1_IN1_N", NULL, "Headset Mic" },
3131
};
3232

33-
static const struct snd_soc_dapm_widget cs42l43_spk_widgets[] = {
33+
static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
3434
SND_SOC_DAPM_SPK("Speaker", NULL),
3535
};
3636

@@ -41,7 +41,7 @@ static const struct snd_soc_dapm_route cs42l43_spk_map[] = {
4141
{ "Speaker", NULL, "cs42l43 AMP2_OUT_N", },
4242
};
4343

44-
static const struct snd_soc_dapm_widget cs42l43_dmic_widgets[] = {
44+
static const struct snd_soc_dapm_widget generic_dmic_widgets[] = {
4545
SND_SOC_DAPM_MIC("DMIC", NULL),
4646
};
4747

@@ -74,8 +74,8 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)
7474
if (!card->components)
7575
return -ENOMEM;
7676

77-
ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_hs_widgets,
78-
ARRAY_SIZE(cs42l43_hs_widgets));
77+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
78+
ARRAY_SIZE(generic_jack_widgets));
7979
if (ret) {
8080
dev_err(card->dev, "cs42l43 hs widgets addition failed: %d\n", ret);
8181
return ret;
@@ -133,8 +133,8 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
133133
return -ENOMEM;
134134
}
135135

136-
ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_spk_widgets,
137-
ARRAY_SIZE(cs42l43_spk_widgets));
136+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
137+
ARRAY_SIZE(generic_spk_widgets));
138138
if (ret) {
139139
dev_err(card->dev, "cs42l43 speaker widgets addition failed: %d\n", ret);
140140
return ret;
@@ -172,8 +172,8 @@ int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
172172
if (!card->components)
173173
return -ENOMEM;
174174

175-
ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_dmic_widgets,
176-
ARRAY_SIZE(cs42l43_dmic_widgets));
175+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_dmic_widgets,
176+
ARRAY_SIZE(generic_dmic_widgets));
177177
if (ret) {
178178
dev_err(card->dev, "cs42l43 dmic widgets addition failed: %d\n", ret);
179179
return ret;

‎sound/soc/intel/boards/sof_sdw_cs_amp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#define CODEC_NAME_SIZE 8
1616

17-
static const struct snd_soc_dapm_widget sof_widgets[] = {
17+
static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
1818
SND_SOC_DAPM_SPK("Speaker", NULL),
1919
};
2020

@@ -35,8 +35,8 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
3535
if (!card->components)
3636
return -ENOMEM;
3737

38-
ret = snd_soc_dapm_new_controls(&card->dapm, sof_widgets,
39-
ARRAY_SIZE(sof_widgets));
38+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
39+
ARRAY_SIZE(generic_spk_widgets));
4040
if (ret) {
4141
dev_err(card->dev, "widgets addition failed: %d\n", ret);
4242
return ret;

‎sound/soc/intel/boards/sof_sdw_rt5682.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <sound/jack.h>
1818
#include "sof_sdw_common.h"
1919

20-
static const struct snd_soc_dapm_widget rt5682_widgets[] = {
20+
static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
2121
SND_SOC_DAPM_HP("Headphone", NULL),
2222
SND_SOC_DAPM_MIC("Headset Mic", NULL),
2323
};
@@ -29,7 +29,7 @@ static const struct snd_soc_dapm_route rt5682_map[] = {
2929
{ "rt5682 IN1P", NULL, "Headset Mic" },
3030
};
3131

32-
static const struct snd_kcontrol_new rt5682_controls[] = {
32+
static const struct snd_kcontrol_new generic_jack_controls[] = {
3333
SOC_DAPM_PIN_SWITCH("Headphone"),
3434
SOC_DAPM_PIN_SWITCH("Headset Mic"),
3535
};
@@ -69,15 +69,15 @@ int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)
6969
if (!card->components)
7070
return -ENOMEM;
7171

72-
ret = snd_soc_add_card_controls(card, rt5682_controls,
73-
ARRAY_SIZE(rt5682_controls));
72+
ret = snd_soc_add_card_controls(card, generic_jack_controls,
73+
ARRAY_SIZE(generic_jack_controls));
7474
if (ret) {
7575
dev_err(card->dev, "rt5682 control addition failed: %d\n", ret);
7676
return ret;
7777
}
7878

79-
ret = snd_soc_dapm_new_controls(&card->dapm, rt5682_widgets,
80-
ARRAY_SIZE(rt5682_widgets));
79+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
80+
ARRAY_SIZE(generic_jack_widgets));
8181
if (ret) {
8282
dev_err(card->dev, "rt5682 widgets addition failed: %d\n", ret);
8383
return ret;

‎sound/soc/intel/boards/sof_sdw_rt711.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static int rt711_add_codec_device_props(struct device *sdw_dev)
4242
return ret;
4343
}
4444

45-
static const struct snd_soc_dapm_widget rt711_widgets[] = {
45+
static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
4646
SND_SOC_DAPM_HP("Headphone", NULL),
4747
SND_SOC_DAPM_MIC("Headset Mic", NULL),
4848
};
@@ -53,7 +53,7 @@ static const struct snd_soc_dapm_route rt711_map[] = {
5353
{ "rt711 MIC2", NULL, "Headset Mic" },
5454
};
5555

56-
static const struct snd_kcontrol_new rt711_controls[] = {
56+
static const struct snd_kcontrol_new generic_jack_controls[] = {
5757
SOC_DAPM_PIN_SWITCH("Headphone"),
5858
SOC_DAPM_PIN_SWITCH("Headset Mic"),
5959
};
@@ -93,15 +93,15 @@ int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd)
9393
if (!card->components)
9494
return -ENOMEM;
9595

96-
ret = snd_soc_add_card_controls(card, rt711_controls,
97-
ARRAY_SIZE(rt711_controls));
96+
ret = snd_soc_add_card_controls(card, generic_jack_controls,
97+
ARRAY_SIZE(generic_jack_controls));
9898
if (ret) {
9999
dev_err(card->dev, "rt711 controls addition failed: %d\n", ret);
100100
return ret;
101101
}
102102

103-
ret = snd_soc_dapm_new_controls(&card->dapm, rt711_widgets,
104-
ARRAY_SIZE(rt711_widgets));
103+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
104+
ARRAY_SIZE(generic_jack_widgets));
105105
if (ret) {
106106
dev_err(card->dev, "rt711 widgets addition failed: %d\n", ret);
107107
return ret;

‎sound/soc/intel/boards/sof_sdw_rt712_sdca.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <sound/soc-dapm.h>
1616
#include "sof_sdw_common.h"
1717

18-
static const struct snd_soc_dapm_widget rt712_spk_widgets[] = {
18+
static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
1919
SND_SOC_DAPM_SPK("Speaker", NULL),
2020
};
2121

@@ -30,7 +30,7 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
3030
{ "Speaker", NULL, "rt712 SPOR" },
3131
};
3232

33-
static const struct snd_kcontrol_new rt712_spk_controls[] = {
33+
static const struct snd_kcontrol_new generic_spk_controls[] = {
3434
SOC_DAPM_PIN_SWITCH("Speaker"),
3535
};
3636

@@ -45,15 +45,15 @@ int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
4545
if (!card->components)
4646
return -ENOMEM;
4747

48-
ret = snd_soc_add_card_controls(card, rt712_spk_controls,
49-
ARRAY_SIZE(rt712_spk_controls));
48+
ret = snd_soc_add_card_controls(card, generic_spk_controls,
49+
ARRAY_SIZE(generic_spk_controls));
5050
if (ret) {
5151
dev_err(card->dev, "rt712 spk controls addition failed: %d\n", ret);
5252
return ret;
5353
}
5454

55-
ret = snd_soc_dapm_new_controls(&card->dapm, rt712_spk_widgets,
56-
ARRAY_SIZE(rt712_spk_widgets));
55+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
56+
ARRAY_SIZE(generic_spk_widgets));
5757
if (ret) {
5858
dev_err(card->dev, "rt712 spk widgets addition failed: %d\n", ret);
5959
return ret;

‎sound/soc/intel/boards/sof_sdw_rt722_sdca.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#include <sound/soc-dapm.h>
1616
#include "sof_sdw_common.h"
1717

18-
static const struct snd_soc_dapm_widget rt722_spk_widgets[] = {
18+
static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
1919
SND_SOC_DAPM_SPK("Speaker", NULL),
2020
};
2121

2222
static const struct snd_soc_dapm_route rt722_spk_map[] = {
2323
{ "Speaker", NULL, "rt722 SPK" },
2424
};
2525

26-
static const struct snd_kcontrol_new rt722_spk_controls[] = {
26+
static const struct snd_kcontrol_new generic_spk_controls[] = {
2727
SOC_DAPM_PIN_SWITCH("Speaker"),
2828
};
2929

@@ -38,15 +38,15 @@ int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
3838
if (!card->components)
3939
return -ENOMEM;
4040

41-
ret = snd_soc_add_card_controls(card, rt722_spk_controls,
42-
ARRAY_SIZE(rt722_spk_controls));
41+
ret = snd_soc_add_card_controls(card, generic_spk_controls,
42+
ARRAY_SIZE(generic_spk_controls));
4343
if (ret) {
4444
dev_err(card->dev, "failed to add rt722 spk controls: %d\n", ret);
4545
return ret;
4646
}
4747

48-
ret = snd_soc_dapm_new_controls(&card->dapm, rt722_spk_widgets,
49-
ARRAY_SIZE(rt722_spk_widgets));
48+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
49+
ARRAY_SIZE(generic_spk_widgets));
5050
if (ret) {
5151
dev_err(card->dev, "failed to add rt722 spk widgets: %d\n", ret);
5252
return ret;

‎sound/soc/intel/boards/sof_sdw_rt_amp.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ static int rt_amp_add_device_props(struct device *sdw_dev)
131131
return ret;
132132
}
133133

134-
static const struct snd_kcontrol_new rt_amp_controls[] = {
135-
SOC_DAPM_PIN_SWITCH("Speaker"),
134+
static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
135+
SND_SOC_DAPM_SPK("Speaker", NULL),
136136
};
137137

138-
static const struct snd_soc_dapm_widget rt_amp_widgets[] = {
139-
SND_SOC_DAPM_SPK("Speaker", NULL),
138+
static const struct snd_kcontrol_new generic_spk_controls[] = {
139+
SOC_DAPM_PIN_SWITCH("Speaker"),
140140
};
141141

142142
/*
@@ -202,15 +202,15 @@ int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
202202
if (!card->components)
203203
return -ENOMEM;
204204

205-
ret = snd_soc_add_card_controls(card, rt_amp_controls,
206-
ARRAY_SIZE(rt_amp_controls));
205+
ret = snd_soc_add_card_controls(card, generic_spk_controls,
206+
ARRAY_SIZE(generic_spk_controls));
207207
if (ret) {
208208
dev_err(card->dev, "%s controls addition failed: %d\n", codec_name, ret);
209209
return ret;
210210
}
211211

212-
ret = snd_soc_dapm_new_controls(&card->dapm, rt_amp_widgets,
213-
ARRAY_SIZE(rt_amp_widgets));
212+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
213+
ARRAY_SIZE(generic_spk_widgets));
214214
if (ret) {
215215
dev_err(card->dev, "%s widgets addition failed: %d\n", codec_name, ret);
216216
return ret;

‎sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static int rt_sdca_jack_add_codec_device_props(struct device *sdw_dev)
4343
return ret;
4444
}
4545

46-
static const struct snd_soc_dapm_widget rt_sdca_jack_widgets[] = {
46+
static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
4747
SND_SOC_DAPM_HP("Headphone", NULL),
4848
SND_SOC_DAPM_MIC("Headset Mic", NULL),
4949
};
@@ -68,7 +68,7 @@ static const struct snd_soc_dapm_route rt722_sdca_map[] = {
6868
{ "rt722 MIC2", NULL, "Headset Mic" },
6969
};
7070

71-
static const struct snd_kcontrol_new rt_sdca_jack_controls[] = {
71+
static const struct snd_kcontrol_new generic_jack_controls[] = {
7272
SOC_DAPM_PIN_SWITCH("Headphone"),
7373
SOC_DAPM_PIN_SWITCH("Headset Mic"),
7474
};
@@ -129,15 +129,15 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd)
129129
}
130130
}
131131

132-
ret = snd_soc_add_card_controls(card, rt_sdca_jack_controls,
133-
ARRAY_SIZE(rt_sdca_jack_controls));
132+
ret = snd_soc_add_card_controls(card, generic_jack_controls,
133+
ARRAY_SIZE(generic_jack_controls));
134134
if (ret) {
135135
dev_err(card->dev, "rt sdca jack controls addition failed: %d\n", ret);
136136
return ret;
137137
}
138138

139-
ret = snd_soc_dapm_new_controls(&card->dapm, rt_sdca_jack_widgets,
140-
ARRAY_SIZE(rt_sdca_jack_widgets));
139+
ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
140+
ARRAY_SIZE(generic_jack_widgets));
141141
if (ret) {
142142
dev_err(card->dev, "rt sdca jack widgets addition failed: %d\n", ret);
143143
return ret;

0 commit comments

Comments
 (0)