diff mbox series

ASoC: Intel: sof-nau8825: fix module alias overflow

Message ID 20221221132515.2363276-1-arnd@kernel.org (mailing list archive)
State Accepted
Commit 3e78986a840d59dd27e636eae3f52dc11125c835
Headers show
Series ASoC: Intel: sof-nau8825: fix module alias overflow | expand

Commit Message

Arnd Bergmann Dec. 21, 2022, 1:24 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

The maximum name length for a platform_device_id entry is 20 characters
including the trailing NUL byte. The sof_nau8825.c file exceeds that,
which causes an obscure error message:

sound/soc/intel/boards/snd-soc-sof_nau8825.mod.c:35:45: error: illegal character encoding in string literal [-Werror,-Winvalid-source-encoding]
MODULE_ALIAS("platform:adl_max98373_nau8825<U+0018><AA>");
                                                   ^~~~
include/linux/module.h:168:49: note: expanded from macro 'MODULE_ALIAS'
                                                ^~~~~~
include/linux/module.h:165:56: note: expanded from macro 'MODULE_INFO'
                                                       ^~~~
include/linux/moduleparam.h:26:47: note: expanded from macro '__MODULE_INFO'
                = __MODULE_INFO_PREFIX __stringify(tag) "=" info

I could not figure out how to make the module handling robust enough
to handle this better, but as a quick fix, using slightly shorter
names that are still unique avoids the build issue.

Fixes: 8d0872f6239f ("ASoC: Intel: add sof-nau8825 machine driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/soc/intel/boards/sof_nau8825.c              | 8 ++++----
 sound/soc/intel/common/soc-acpi-intel-adl-match.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

Pierre-Louis Bossart Dec. 21, 2022, 3:41 p.m. UTC | #1 
On 12/21/22 07:24, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The maximum name length for a platform_device_id entry is 20 characters
> including the trailing NUL byte. The sof_nau8825.c file exceeds that,
> which causes an obscure error message:
> 
> sound/soc/intel/boards/snd-soc-sof_nau8825.mod.c:35:45: error: illegal character encoding in string literal [-Werror,-Winvalid-source-encoding]
> MODULE_ALIAS("platform:adl_max98373_nau8825<U+0018><AA>");
>                                                    ^~~~
> include/linux/module.h:168:49: note: expanded from macro 'MODULE_ALIAS'
>                                                 ^~~~~~
> include/linux/module.h:165:56: note: expanded from macro 'MODULE_INFO'
>                                                        ^~~~
> include/linux/moduleparam.h:26:47: note: expanded from macro '__MODULE_INFO'
>                 = __MODULE_INFO_PREFIX __stringify(tag) "=" info
> 
> I could not figure out how to make the module handling robust enough
> to handle this better, but as a quick fix, using slightly shorter
> names that are still unique avoids the build issue.
> 
> Fixes: 8d0872f6239f ("ASoC: Intel: add sof-nau8825 machine driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks Arnd, yes unfortunately that keeps on happening. We cleaned-up a
bunch of Chromebook platforms but newer ones have the same long name
issue obviously.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>  sound/soc/intel/boards/sof_nau8825.c              | 8 ++++----
>  sound/soc/intel/common/soc-acpi-intel-adl-match.c | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
> index 27880224359d..009a41fbefa1 100644
> --- a/sound/soc/intel/boards/sof_nau8825.c
> +++ b/sound/soc/intel/boards/sof_nau8825.c
> @@ -618,7 +618,7 @@ static const struct platform_device_id board_ids[] = {
>  
>  	},
>  	{
> -		.name = "adl_rt1019p_nau8825",
> +		.name = "adl_rt1019p_8825",
>  		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
>  					SOF_SPEAKER_AMP_PRESENT |
>  					SOF_RT1019P_SPEAKER_AMP_PRESENT |
> @@ -626,7 +626,7 @@ static const struct platform_device_id board_ids[] = {
>  					SOF_NAU8825_NUM_HDMIDEV(4)),
>  	},
>  	{
> -		.name = "adl_max98373_nau8825",
> +		.name = "adl_max98373_8825",
>  		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
>  					SOF_SPEAKER_AMP_PRESENT |
>  					SOF_MAX98373_SPEAKER_AMP_PRESENT |
> @@ -637,7 +637,7 @@ static const struct platform_device_id board_ids[] = {
>  	},
>  	{
>  		/* The limitation of length of char array, shorten the name */
> -		.name = "adl_mx98360a_nau8825",
> +		.name = "adl_mx98360a_8825",
>  		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
>  					SOF_SPEAKER_AMP_PRESENT |
>  					SOF_MAX98360A_SPEAKER_AMP_PRESENT |
> @@ -648,7 +648,7 @@ static const struct platform_device_id board_ids[] = {
>  
>  	},
>  	{
> -		.name = "adl_rt1015p_nau8825",
> +		.name = "adl_rt1015p_8825",
>  		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
>  					SOF_SPEAKER_AMP_PRESENT |
>  					SOF_RT1015P_SPEAKER_AMP_PRESENT |
> diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> index 60aee56f94bd..1f79fef600ac 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> @@ -474,21 +474,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
>  	},
>  	{
>  		.id = "10508825",
> -		.drv_name = "adl_rt1019p_nau8825",
> +		.drv_name = "adl_rt1019p_8825",
>  		.machine_quirk = snd_soc_acpi_codec_list,
>  		.quirk_data = &adl_rt1019p_amp,
>  		.sof_tplg_filename = "sof-adl-rt1019-nau8825.tplg",
>  	},
>  	{
>  		.id = "10508825",
> -		.drv_name = "adl_max98373_nau8825",
> +		.drv_name = "adl_max98373_8825",
>  		.machine_quirk = snd_soc_acpi_codec_list,
>  		.quirk_data = &adl_max98373_amp,
>  		.sof_tplg_filename = "sof-adl-max98373-nau8825.tplg",
>  	},
>  	{
>  		.id = "10508825",
> -		.drv_name = "adl_mx98360a_nau8825",
> +		.drv_name = "adl_mx98360a_8825",
>  		.machine_quirk = snd_soc_acpi_codec_list,
>  		.quirk_data = &adl_max98360a_amp,
>  		.sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg",
> @@ -502,7 +502,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
>  	},
>  	{
>  		.id = "10508825",
> -		.drv_name = "adl_rt1015p_nau8825",
> +		.drv_name = "adl_rt1015p_8825",
>  		.machine_quirk = snd_soc_acpi_codec_list,
>  		.quirk_data = &adl_rt1015p_amp,
>  		.sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg",
Mark Brown Dec. 26, 2022, 11:33 p.m. UTC | #2 
On Wed, 21 Dec 2022 14:24:56 +0100, Arnd Bergmann wrote:
> The maximum name length for a platform_device_id entry is 20 characters
> including the trailing NUL byte. The sof_nau8825.c file exceeds that,
> which causes an obscure error message:
> 
> sound/soc/intel/boards/snd-soc-sof_nau8825.mod.c:35:45: error: illegal character encoding in string literal [-Werror,-Winvalid-source-encoding]
> MODULE_ALIAS("platform:adl_max98373_nau8825<U+0018><AA>");
>                                                    ^~~~
> include/linux/module.h:168:49: note: expanded from macro 'MODULE_ALIAS'
>                                                 ^~~~~~
> include/linux/module.h:165:56: note: expanded from macro 'MODULE_INFO'
>                                                        ^~~~
> include/linux/moduleparam.h:26:47: note: expanded from macro '__MODULE_INFO'
>                 = __MODULE_INFO_PREFIX __stringify(tag) "=" info
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: sof-nau8825: fix module alias overflow
      commit: 3e78986a840d59dd27e636eae3f52dc11125c835

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
index 27880224359d..009a41fbefa1 100644
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -618,7 +618,7 @@  static const struct platform_device_id board_ids[] = {
 
 	},
 	{
-		.name = "adl_rt1019p_nau8825",
+		.name = "adl_rt1019p_8825",
 		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
 					SOF_RT1019P_SPEAKER_AMP_PRESENT |
@@ -626,7 +626,7 @@  static const struct platform_device_id board_ids[] = {
 					SOF_NAU8825_NUM_HDMIDEV(4)),
 	},
 	{
-		.name = "adl_max98373_nau8825",
+		.name = "adl_max98373_8825",
 		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
 					SOF_MAX98373_SPEAKER_AMP_PRESENT |
@@ -637,7 +637,7 @@  static const struct platform_device_id board_ids[] = {
 	},
 	{
 		/* The limitation of length of char array, shorten the name */
-		.name = "adl_mx98360a_nau8825",
+		.name = "adl_mx98360a_8825",
 		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
 					SOF_MAX98360A_SPEAKER_AMP_PRESENT |
@@ -648,7 +648,7 @@  static const struct platform_device_id board_ids[] = {
 
 	},
 	{
-		.name = "adl_rt1015p_nau8825",
+		.name = "adl_rt1015p_8825",
 		.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
 					SOF_RT1015P_SPEAKER_AMP_PRESENT |
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 60aee56f94bd..1f79fef600ac 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -474,21 +474,21 @@  struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
 	},
 	{
 		.id = "10508825",
-		.drv_name = "adl_rt1019p_nau8825",
+		.drv_name = "adl_rt1019p_8825",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &adl_rt1019p_amp,
 		.sof_tplg_filename = "sof-adl-rt1019-nau8825.tplg",
 	},
 	{
 		.id = "10508825",
-		.drv_name = "adl_max98373_nau8825",
+		.drv_name = "adl_max98373_8825",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &adl_max98373_amp,
 		.sof_tplg_filename = "sof-adl-max98373-nau8825.tplg",
 	},
 	{
 		.id = "10508825",
-		.drv_name = "adl_mx98360a_nau8825",
+		.drv_name = "adl_mx98360a_8825",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &adl_max98360a_amp,
 		.sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg",
@@ -502,7 +502,7 @@  struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
 	},
 	{
 		.id = "10508825",
-		.drv_name = "adl_rt1015p_nau8825",
+		.drv_name = "adl_rt1015p_8825",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &adl_rt1015p_amp,
 		.sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg",