[PATCH 1/2] ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name()

[PATCH 1/2] ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name()

[Takashi Iwai]

For systems without DMI, it makes no sense to have the code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 include/sound/soc.h  | 8 ++++++++
 sound/soc/soc-core.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index cdfb55f7aede..915c06cb2b32 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -497,7 +497,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
 int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 	unsigned int dai_fmt);
 
+#ifdef CONFIG_DMI
 int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
+#else
+static inline int snd_soc_set_dmi_name(struct snd_soc_card *card,
+				       const char *flavour)
+{
+	return 0;
+}
+#endif
 
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2722bb0c5573..aac73ff8a92a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1918,6 +1918,7 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
 
 
+#ifdef CONFIG_DMI
 /* Trim special characters, and replace '-' with '_' since '-' is used to
  * separate different DMI fields in the card long name. Only number and
  * alphabet characters and a few separator characters are kept.
@@ -2049,6 +2050,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name);
+#endif /* CONFIG_DMI */
 
 static int snd_soc_instantiate_card(struct snd_soc_card *card)
 {
-- 
2.11.1

[PATCH 2/2] ASoC: Call snd_soc_set_dmi_name() unconditionally

[Takashi Iwai]

Since recently UCM can pick up a configuration specific to the board
via card longname field, and we introduced a helper function
snd_soc_set_dmi_name() for that.  So far, it was used only in one
place (sound/soc/intel/boards/broadwell.c), but it should be more
widely applied.

This patch puts a big hammer for that: it lets snd_soc_register_card()
calling snd_soc_set_dmi_name() unconditionally, so that all x86
devices get the better longname string.  This would have no impact for
other systems without DMI support, as snd_soc_set_dmi_name() is no-op
on them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/intel/boards/broadwell.c | 3 ---
 sound/soc/soc-core.c               | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
index faf865bb1765..6dcbbcefc25b 100644
--- a/sound/soc/intel/boards/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
@@ -269,9 +269,6 @@ static struct snd_soc_card broadwell_rt286 = {
 static int broadwell_audio_probe(struct platform_device *pdev)
 {
 	broadwell_rt286.dev = &pdev->dev;
-
-	snd_soc_set_dmi_name(&broadwell_rt286, NULL);
-
 	return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
 }
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index aac73ff8a92a..6536eccdafae 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2192,6 +2192,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
 		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
 					card->num_of_dapm_routes);
 
+	/* try to set some sane longname if DMI is available */
+	snd_soc_set_dmi_name(card);
+
 	snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
 		 "%s", card->name);
 	snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
-- 
2.11.1

Re: [PATCH 1/2] ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name()

[Liam Girdwood]

On Fri, 2017-04-21 at 17:55 +0200, Takashi Iwai wrote:
> For systems without DMI, it makes no sense to have the code.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---

Both :-

Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

>  include/sound/soc.h  | 8 ++++++++
>  sound/soc/soc-core.c | 2 ++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/include/sound/soc.h b/include/sound/soc.h
> index cdfb55f7aede..915c06cb2b32 100644
> --- a/include/sound/soc.h
> +++ b/include/sound/soc.h
> @@ -497,7 +497,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
>  int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
>  	unsigned int dai_fmt);
>  
> +#ifdef CONFIG_DMI
>  int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
> +#else
> +static inline int snd_soc_set_dmi_name(struct snd_soc_card *card,
> +				       const char *flavour)
> +{
> +	return 0;
> +}
> +#endif
>  
>  /* Utility functions to get clock rates from various things */
>  int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 2722bb0c5573..aac73ff8a92a 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -1918,6 +1918,7 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
>  EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
>  
> 
> +#ifdef CONFIG_DMI
>  /* Trim special characters, and replace '-' with '_' since '-' is used to
>   * separate different DMI fields in the card long name. Only number and
>   * alphabet characters and a few separator characters are kept.
> @@ -2049,6 +2050,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
>  	return 0;
>  }
>  EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name);
> +#endif /* CONFIG_DMI */
>  
>  static int snd_soc_instantiate_card(struct snd_soc_card *card)
>  {

Re: [PATCH 2/2] ASoC: Call snd_soc_set_dmi_name() unconditionally

[kbuild test robot]

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

Hi Takashi,

[auto build test ERROR on asoc/for-next]
[also build test ERROR on v4.11-rc7 next-20170421]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Takashi-Iwai/ASoC-Provide-a-dummy-wrapper-of-snd_soc_set_dmi_name/20170422-122651
base:   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: x86_64-acpi-redef (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   sound/soc/soc-core.c: In function 'snd_soc_instantiate_card':
>> sound/soc/soc-core.c:2191:2: error: too few arguments to function 'snd_soc_set_dmi_name'
     snd_soc_set_dmi_name(card);
     ^~~~~~~~~~~~~~~~~~~~
   sound/soc/soc-core.c:1967:5: note: declared here
    int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
        ^~~~~~~~~~~~~~~~~~~~

vim +/snd_soc_set_dmi_name +2191 sound/soc/soc-core.c

  2185	
  2186		if (card->of_dapm_routes)
  2187			snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
  2188						card->num_of_dapm_routes);
  2189	
  2190		/* try to set some sane longname if DMI is available */
> 2191		snd_soc_set_dmi_name(card);
  2192	
  2193		snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
  2194			 "%s", card->name);

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 29551 bytes --]

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 2/2] ASoC: Call snd_soc_set_dmi_name() unconditionally

[Vinod Koul]

On Fri, Apr 21, 2017 at 05:55:25PM +0200, Takashi Iwai wrote:
> Since recently UCM can pick up a configuration specific to the board
> via card longname field, and we introduced a helper function
> snd_soc_set_dmi_name() for that.  So far, it was used only in one
> place (sound/soc/intel/boards/broadwell.c), but it should be more
> widely applied.
> 
> This patch puts a big hammer for that: it lets snd_soc_register_card()
> calling snd_soc_set_dmi_name() unconditionally, so that all x86
> devices get the better longname string.  This would have no impact for
> other systems without DMI support, as snd_soc_set_dmi_name() is no-op
> on them.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  sound/soc/intel/boards/broadwell.c | 3 ---
>  sound/soc/soc-core.c               | 3 +++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
> index faf865bb1765..6dcbbcefc25b 100644
> --- a/sound/soc/intel/boards/broadwell.c
> +++ b/sound/soc/intel/boards/broadwell.c
> @@ -269,9 +269,6 @@ static struct snd_soc_card broadwell_rt286 = {
>  static int broadwell_audio_probe(struct platform_device *pdev)
>  {
>  	broadwell_rt286.dev = &pdev->dev;
> -
> -	snd_soc_set_dmi_name(&broadwell_rt286, NULL);
> -
>  	return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
>  }
>  
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index aac73ff8a92a..6536eccdafae 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -2192,6 +2192,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
>  		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
>  					card->num_of_dapm_routes);
>  
> +	/* try to set some sane longname if DMI is available */
> +	snd_soc_set_dmi_name(card);

This is missing NULL as second arg.

-- 
~Vinod

Re: [PATCH 2/2] ASoC: Call snd_soc_set_dmi_name() unconditionally

[Takashi Iwai]

On Mon, 24 Apr 2017 06:47:45 +0200,
Vinod Koul wrote:
> 
> On Fri, Apr 21, 2017 at 05:55:25PM +0200, Takashi Iwai wrote:
> > Since recently UCM can pick up a configuration specific to the board
> > via card longname field, and we introduced a helper function
> > snd_soc_set_dmi_name() for that.  So far, it was used only in one
> > place (sound/soc/intel/boards/broadwell.c), but it should be more
> > widely applied.
> > 
> > This patch puts a big hammer for that: it lets snd_soc_register_card()
> > calling snd_soc_set_dmi_name() unconditionally, so that all x86
> > devices get the better longname string.  This would have no impact for
> > other systems without DMI support, as snd_soc_set_dmi_name() is no-op
> > on them.
> > 
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> >  sound/soc/intel/boards/broadwell.c | 3 ---
> >  sound/soc/soc-core.c               | 3 +++
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
> > index faf865bb1765..6dcbbcefc25b 100644
> > --- a/sound/soc/intel/boards/broadwell.c
> > +++ b/sound/soc/intel/boards/broadwell.c
> > @@ -269,9 +269,6 @@ static struct snd_soc_card broadwell_rt286 = {
> >  static int broadwell_audio_probe(struct platform_device *pdev)
> >  {
> >  	broadwell_rt286.dev = &pdev->dev;
> > -
> > -	snd_soc_set_dmi_name(&broadwell_rt286, NULL);
> > -
> >  	return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
> >  }
> >  
> > diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> > index aac73ff8a92a..6536eccdafae 100644
> > --- a/sound/soc/soc-core.c
> > +++ b/sound/soc/soc-core.c
> > @@ -2192,6 +2192,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
> >  		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
> >  					card->num_of_dapm_routes);
> >  
> > +	/* try to set some sane longname if DMI is available */
> > +	snd_soc_set_dmi_name(card);
> 
> This is missing NULL as second arg.

Sorry, I thought I compile-tested, but apparently not.
Will refresh and resubmit.


Takashi

Applied "ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name()" to the asoc tree

[Mark Brown]

The patch

   ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name()

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

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

>From 1f5a4535db41bd2bb8d1a15f098cb2921d6c1317 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 24 Apr 2017 08:54:41 +0200
Subject: [PATCH] ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name()

For systems without DMI, it makes no sense to have the code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 include/sound/soc.h  | 8 ++++++++
 sound/soc/soc-core.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index cdfb55f7aede..915c06cb2b32 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -497,7 +497,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
 int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 	unsigned int dai_fmt);
 
+#ifdef CONFIG_DMI
 int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
+#else
+static inline int snd_soc_set_dmi_name(struct snd_soc_card *card,
+				       const char *flavour)
+{
+	return 0;
+}
+#endif
 
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6dca408faae3..52f6d9c28df9 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1918,6 +1918,7 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
 
 
+#ifdef CONFIG_DMI
 /* Trim special characters, and replace '-' with '_' since '-' is used to
  * separate different DMI fields in the card long name. Only number and
  * alphabet characters and a few separator characters are kept.
@@ -2049,6 +2050,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name);
+#endif /* CONFIG_DMI */
 
 static int snd_soc_instantiate_card(struct snd_soc_card *card)
 {
-- 
2.11.0