[alsa-devel] [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 at 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