ASoC: Intel: soc-acpi-intel-lnl/ptl-match: Simplify variable name

macchian · broonie · commit e79cc43b4833 · 2025-05-08T10:32:45.000+09:00
The variable name contains duplications;thus, remove the redundant strings. Signed-off-by: Mac Chiang <mac.chiang@intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://patch.msgid.link/20250507122649.153579-2-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@ -137,7 +137,7 @@ static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
 	},
 };
 
-static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = {
+static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints[] = {
 	/* Jack Endpoint */
 	{
 		.num = 0,
@@ -350,8 +350,8 @@ static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = {
 static const struct snd_soc_acpi_adr_device rt712_vb_2_group1_adr[] = {
 	{
 		.adr = 0x000230025D071201ull,
-		.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints),
-		.endpoints = jack_amp_g1_dmic_endpoints_endpoints,
+		.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),
+		.endpoints = jack_amp_g1_dmic_endpoints,
 		.name_prefix = "rt712"
 	}
 };
diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -138,7 +138,7 @@ static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
 	},
 };
 
-static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = {
+static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints[] = {
 	/* Jack Endpoint */
 	{
 		.num = 0,
@@ -288,17 +288,17 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
 static const struct snd_soc_acpi_adr_device rt712_vb_2_group1_adr[] = {
 	{
 		.adr = 0x000230025D071201ull,
-		.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints),
-		.endpoints = jack_amp_g1_dmic_endpoints_endpoints,
+		.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),
+		.endpoints = jack_amp_g1_dmic_endpoints,
 		.name_prefix = "rt712"
 	}
 };
 
 static const struct snd_soc_acpi_adr_device rt712_vb_3_group1_adr[] = {
 	{
 		.adr = 0x000330025D071201ull,
-		.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints),
-		.endpoints = jack_amp_g1_dmic_endpoints_endpoints,
+		.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),
+		.endpoints = jack_amp_g1_dmic_endpoints,
 		.name_prefix = "rt712"
 	}
 };

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {`
`137`	`137`	`},`
`138`	`138`	`};`
`139`	`139`
`140`		`-static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = {`
	`140`	`+static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints[] = {`
`141`	`141`	`/* Jack Endpoint */`
`142`	`142`	`{`
`143`	`143`	`.num = 0,`
`@@ -350,8 +350,8 @@ static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = {`
`350`	`350`	`static const struct snd_soc_acpi_adr_device rt712_vb_2_group1_adr[] = {`
`351`	`351`	`{`
`352`	`352`	`.adr = 0x000230025D071201ull,`
`353`		`- .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints),`
`354`		`- .endpoints = jack_amp_g1_dmic_endpoints_endpoints,`
	`353`	`+ .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),`
	`354`	`+ .endpoints = jack_amp_g1_dmic_endpoints,`
`355`	`355`	`.name_prefix = "rt712"`
`356`	`356`	`}`
`357`	`357`	`};`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {`
`138`	`138`	`},`
`139`	`139`	`};`
`140`	`140`
`141`		`-static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = {`
	`141`	`+static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints[] = {`
`142`	`142`	`/* Jack Endpoint */`
`143`	`143`	`{`
`144`	`144`	`.num = 0,`
`@@ -288,17 +288,17 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {`
`288`	`288`	`static const struct snd_soc_acpi_adr_device rt712_vb_2_group1_adr[] = {`
`289`	`289`	`{`
`290`	`290`	`.adr = 0x000230025D071201ull,`
`291`		`- .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints),`
`292`		`- .endpoints = jack_amp_g1_dmic_endpoints_endpoints,`
	`291`	`+ .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),`
	`292`	`+ .endpoints = jack_amp_g1_dmic_endpoints,`
`293`	`293`	`.name_prefix = "rt712"`
`294`	`294`	`}`
`295`	`295`	`};`
`296`	`296`
`297`	`297`	`static const struct snd_soc_acpi_adr_device rt712_vb_3_group1_adr[] = {`
`298`	`298`	`{`
`299`	`299`	`.adr = 0x000330025D071201ull,`
`300`		`- .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints),`
`301`		`- .endpoints = jack_amp_g1_dmic_endpoints_endpoints,`
	`300`	`+ .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),`
	`301`	`+ .endpoints = jack_amp_g1_dmic_endpoints,`
`302`	`302`	`.name_prefix = "rt712"`
`303`	`303`	`}`
`304`	`304`	`};`