Unverified Commit 5449fd7b authored Mar 30, 2022 by Rikard Falkeborn Committed by Mark Brown Apr 05, 2022

ASoC: samsung: Constify snd_soc_dapm_{route,widget} structs



These structs only have their address assigned to the
dapm_{routes,widget} fields in the snd_soc_card struct,
both which are pointers to const data. Make them const to
allow the compiler to put them in read-only memory.

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220330204227.25081-1-rikard.falkeborn@gmail.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 5e9058ea

sound/soc/samsung/bells.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -386,11 +386,11 @@ static struct snd_soc_codec_conf bells_codec_conf[] = {
		},
		};

		static struct snd_soc_dapm_widget bells_widgets[] = {
		static const struct snd_soc_dapm_widget bells_widgets[] = {
		SND_SOC_DAPM_MIC("DMIC", NULL),
		};

		static struct snd_soc_dapm_route bells_routes[] = {
		static const struct snd_soc_dapm_route bells_routes[] = {
		{ "Sub CLK_SYS", NULL, "OPCLK" },
		{ "CLKIN", NULL, "OPCLK" },

sound/soc/samsung/littlemill.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ static const struct snd_kcontrol_new controls[] = {
		SOC_DAPM_PIN_SWITCH("WM1250 Output"),
		};

		static struct snd_soc_dapm_widget widgets[] = {
		static const struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_HP("Headphone", NULL),

		SND_SOC_DAPM_MIC("AMIC", NULL),
		@@ -239,7 +239,7 @@ static struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
		};

		static struct snd_soc_dapm_route audio_paths[] = {
		static const struct snd_soc_dapm_route audio_paths[] = {
		{ "Headphone", NULL, "HPOUT1L" },
		{ "Headphone", NULL, "HPOUT1R" },

sound/soc/samsung/lowland.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ static const struct snd_kcontrol_new controls[] = {
		SOC_DAPM_PIN_SWITCH("Headphone"),
		};

		static struct snd_soc_dapm_widget widgets[] = {
		static const struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_HP("Headphone", NULL),
		SND_SOC_DAPM_MIC("Headset Mic", NULL),

		@@ -150,7 +150,7 @@ static struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_MIC("Main DMIC", NULL),
		};

		static struct snd_soc_dapm_route audio_paths[] = {
		static const struct snd_soc_dapm_route audio_paths[] = {
		{ "Sub IN1", NULL, "HPOUT2L" },
		{ "Sub IN2", NULL, "HPOUT2R" },

sound/soc/samsung/speyside.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ static const struct snd_kcontrol_new controls[] = {
		SOC_DAPM_PIN_SWITCH("Headphone"),
		};

		static struct snd_soc_dapm_widget widgets[] = {
		static const struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_HP("Headphone", NULL),
		SND_SOC_DAPM_MIC("Headset Mic", NULL),

		@@ -271,7 +271,7 @@ static struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_MIC("Main DMIC", NULL),
		};

		static struct snd_soc_dapm_route audio_paths[] = {
		static const struct snd_soc_dapm_route audio_paths[] = {
		{ "IN1RN", NULL, "MICB1" },
		{ "IN1RP", NULL, "MICB1" },
		{ "IN1RN", NULL, "MICB2" },

sound/soc/samsung/tobermory.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ static const struct snd_kcontrol_new controls[] = {
		SOC_DAPM_PIN_SWITCH("DMIC"),
		};

		static struct snd_soc_dapm_widget widgets[] = {
		static const struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_HP("Headphone", NULL),
		SND_SOC_DAPM_MIC("Headset Mic", NULL),

		@@ -140,7 +140,7 @@ static struct snd_soc_dapm_widget widgets[] = {
		SND_SOC_DAPM_SPK("Main Speaker", NULL),
		};

		static struct snd_soc_dapm_route audio_paths[] = {
		static const struct snd_soc_dapm_route audio_paths[] = {
		{ "Headphone", NULL, "HPOUTL" },
		{ "Headphone", NULL, "HPOUTR" },