Unverified Commit 01c266af authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

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: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-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: default avatarMark Brown <broonie@kernel.org>
parent 1628e1c8

sound/soc/intel/boards/sof_sdw_cs42l42.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

sound/soc/intel/boards/sof_sdw_cs42l43.c

+9 −9
Original line number Diff line number Diff line
@@ -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;

sound/soc/intel/boards/sof_sdw_cs_amp.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

sound/soc/intel/boards/sof_sdw_rt5682.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

sound/soc/intel/boards/sof_sdw_rt711.c

+6 −6
Original line number Diff line number Diff line
@@ -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;