Unverified Commit 590cfb08 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters 



Some Chromebooks machine driver aliases exceed 20 characters, which
leads to sparse warnings:

sound/soc/intel/boards/sof_rt5682.c:959:25: error: too long
initializer-string for array of char(no space for nul char)

sound/soc/intel/boards/sof_rt5682.c:989:25: error: too long
initializer-string for array of char(no space for nul char)

sound/soc/intel/boards/sof_rt5682.c:1039:25: error: too long
initializer-string for array of char(no space for nul char)

Fix by using the 'mx' shortcut for Maxim platforms (already used in
platform firmware)

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-4-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b0cf3d3c

sound/soc/intel/boards/sof_rt5682.c

+10 −10
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ static const struct platform_device_id board_ids[] = { 
		.name = "sof_rt5682",

	},

	{

		.name = "tgl_max98357a_rt5682",

		.name = "tgl_mx98357a_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |
@@ -975,7 +975,7 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT5682_SSP_AMP(1)),

	},

	{

		.name = "tgl_max98373_rt5682",

		.name = "tgl_mx98373_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |
@@ -986,7 +986,7 @@ static const struct platform_device_id board_ids[] = { 
					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "jsl_rt5682_max98360a",

		.name = "jsl_rt5682_mx98360a",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_MCLK_24MHZ |

					SOF_RT5682_SSP_CODEC(0) |
@@ -1025,7 +1025,7 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT5682_SSP_AMP(1)),

	},

	{

		.name = "adl_max98373_rt5682",

		.name = "adl_mx98373_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |
@@ -1036,7 +1036,7 @@ static const struct platform_device_id board_ids[] = { 
					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "adl_max98357a_rt5682",

		.name = "adl_mx98357a_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |
@@ -1064,14 +1064,14 @@ MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>"); 
MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:sof_rt5682");

MODULE_ALIAS("platform:tgl_max98357a_rt5682");

MODULE_ALIAS("platform:tgl_mx98357a_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_rt1015");

MODULE_ALIAS("platform:tgl_max98373_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_max98360a");

MODULE_ALIAS("platform:tgl_mx98373_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_mx98360a");

MODULE_ALIAS("platform:cml_rt1015_rt5682");

MODULE_ALIAS("platform:tgl_rt1011_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_rt1015p");

MODULE_ALIAS("platform:adl_max98373_rt5682");

MODULE_ALIAS("platform:adl_max98357a_rt5682");

MODULE_ALIAS("platform:adl_mx98373_rt5682");

MODULE_ALIAS("platform:adl_mx98357a_rt5682");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);

sound/soc/intel/common/soc-acpi-intel-adl-match.c

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = { 
struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {

	{

		.id = "10EC5682",

		.drv_name = "adl_max98373_rt5682",

		.drv_name = "adl_mx98373_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98373_amp,

		.sof_fw_filename = "sof-adl.ri",
@@ -291,7 +291,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
	},

	{

		.id = "10EC5682",

		.drv_name = "adl_max98357a_rt5682",

		.drv_name = "adl_mx98357a_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98357a_amp,

		.sof_fw_filename = "sof-adl.ri",

sound/soc/intel/common/soc-acpi-intel-jsl-match.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { 
	},

	{

		.id = "10EC5682",

		.drv_name = "jsl_rt5682_max98360a",

		.drv_name = "jsl_rt5682_mx98360a",

		.sof_fw_filename = "sof-jsl.ri",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &mx98360a_spk,

sound/soc/intel/common/soc-acpi-intel-tgl-match.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = { 
struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {

	{

		.id = "10EC5682",

		.drv_name = "tgl_max98357a_rt5682",

		.drv_name = "tgl_mx98357a_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &tgl_codecs,

		.sof_fw_filename = "sof-tgl.ri",
@@ -331,7 +331,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { 
	},

	{

		.id = "10EC5682",

		.drv_name = "tgl_max98373_rt5682",

		.drv_name = "tgl_mx98373_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &tgl_max98373_amp,

		.sof_fw_filename = "sof-tgl.ri",