[PATCH 1/2] ASoC: fsl: define a common DRIVER_NAME

[PATCH 1/2] ASoC: fsl: define a common DRIVER_NAME

[Alexander Stein]

Instead of copying the driver name manually, use a common define.
No functional change.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 sound/soc/fsl/fsl-asoc-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index cdfca9fd1eb0..e956abfd50f8 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -28,6 +28,8 @@
 #include "../codecs/wm8994.h"
 #include "../codecs/tlv320aic31xx.h"
 
+#define DRIVER_NAME "fsl-asoc-card"
+
 #define CS427x_SYSCLK_MCLK 0
 
 #define RX 0
@@ -915,7 +917,7 @@ MODULE_DEVICE_TABLE(of, fsl_asoc_card_dt_ids);
 static struct platform_driver fsl_asoc_card_driver = {
 	.probe = fsl_asoc_card_probe,
 	.driver = {
-		.name = "fsl-asoc-card",
+		.name = DRIVER_NAME,
 		.pm = &snd_soc_pm_ops,
 		.of_match_table = fsl_asoc_card_dt_ids,
 	},
@@ -924,5 +926,5 @@ module_platform_driver(fsl_asoc_card_driver);
 
 MODULE_DESCRIPTION("Freescale Generic ASoC Sound Card driver with ASRC");
 MODULE_AUTHOR("Nicolin Chen <nicoleotsuka@gmail.com>");
-MODULE_ALIAS("platform:fsl-asoc-card");
+MODULE_ALIAS("platform:" DRIVER_NAME);
 MODULE_LICENSE("GPL");
-- 
2.34.1

[PATCH 2/2] ASoC: fsl: Specify driver name in ASoC card

[Alexander Stein]

Set the snd_soc_card driver name which fixes the warning:
fsl-asoc-card sound: ASoC: driver name too long 'imx-audio-tlv320aic32x4'
-> 'imx-audio-tlv32'

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
These patches could be squashed, but I opted for separation this patch
is the actual functional change. Patch 1 is just preparation.

 sound/soc/fsl/fsl-asoc-card.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index e956abfd50f8..bffa1048d31e 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -609,6 +609,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
 
 	priv->card.dapm_routes = audio_map;
 	priv->card.num_dapm_routes = ARRAY_SIZE(audio_map);
+	priv->card.driver_name = DRIVER_NAME;
 	/* Diversify the card configurations */
 	if (of_device_is_compatible(np, "fsl,imx-audio-cs42888")) {
 		codec_dai_name = "cs42888";
-- 
2.34.1

Re: [PATCH 2/2] ASoC: fsl: Specify driver name in ASoC card

[Shengjiu Wang]

[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]

On Thu, Mar 16, 2023 at 8:36 PM Alexander Stein <
alexander.stein@ew.tq-group.com> wrote:

> Set the snd_soc_card driver name which fixes the warning:
> fsl-asoc-card sound: ASoC: driver name too long 'imx-audio-tlv320aic32x4'
> -> 'imx-audio-tlv32'
>
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
>

Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>

Best regards
wang shengjiu

> ---
> These patches could be squashed, but I opted for separation this patch
> is the actual functional change. Patch 1 is just preparation.
>
>  sound/soc/fsl/fsl-asoc-card.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index e956abfd50f8..bffa1048d31e 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -609,6 +609,7 @@ static int fsl_asoc_card_probe(struct platform_device
> *pdev)
>
>         priv->card.dapm_routes = audio_map;
>         priv->card.num_dapm_routes = ARRAY_SIZE(audio_map);
> +       priv->card.driver_name = DRIVER_NAME;
>         /* Diversify the card configurations */
>         if (of_device_is_compatible(np, "fsl,imx-audio-cs42888")) {
>                 codec_dai_name = "cs42888";
> --
> 2.34.1
>
>

[-- Attachment #2: Type: text/html, Size: 2040 bytes --]

Re: [PATCH 1/2] ASoC: fsl: define a common DRIVER_NAME

[Shengjiu Wang]

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

On Thu, Mar 16, 2023 at 8:36 PM Alexander Stein <
alexander.stein@ew.tq-group.com> wrote:

> Instead of copying the driver name manually, use a common define.
> No functional change.
>
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
>

Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>

Best regards
wang shengjiu

> ---
>  sound/soc/fsl/fsl-asoc-card.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index cdfca9fd1eb0..e956abfd50f8 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -28,6 +28,8 @@
>  #include "../codecs/wm8994.h"
>  #include "../codecs/tlv320aic31xx.h"
>
> +#define DRIVER_NAME "fsl-asoc-card"
> +
>  #define CS427x_SYSCLK_MCLK 0
>
>  #define RX 0
> @@ -915,7 +917,7 @@ MODULE_DEVICE_TABLE(of, fsl_asoc_card_dt_ids);
>  static struct platform_driver fsl_asoc_card_driver = {
>         .probe = fsl_asoc_card_probe,
>         .driver = {
> -               .name = "fsl-asoc-card",
> +               .name = DRIVER_NAME,
>                 .pm = &snd_soc_pm_ops,
>                 .of_match_table = fsl_asoc_card_dt_ids,
>         },
> @@ -924,5 +926,5 @@ module_platform_driver(fsl_asoc_card_driver);
>
>  MODULE_DESCRIPTION("Freescale Generic ASoC Sound Card driver with ASRC");
>  MODULE_AUTHOR("Nicolin Chen <nicoleotsuka@gmail.com>");
> -MODULE_ALIAS("platform:fsl-asoc-card");
> +MODULE_ALIAS("platform:" DRIVER_NAME);
>  MODULE_LICENSE("GPL");
> --
> 2.34.1
>
>

[-- Attachment #2: Type: text/html, Size: 2513 bytes --]

Re: [PATCH 1/2] ASoC: fsl: define a common DRIVER_NAME

[Mark Brown]

On Thu, 16 Mar 2023 13:36:10 +0100, Alexander Stein wrote:
> Instead of copying the driver name manually, use a common define.
> No functional change.
> 
> 

Applied to

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

Thanks!

[1/2] ASoC: fsl: define a common DRIVER_NAME
      commit: 1d52cba3b99278f178bfadf88e666648a217a813
[2/2] ASoC: fsl: Specify driver name in ASoC card
      commit: 9934844f6b49fb9964f878f12912abe689eaed5d

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