| Message ID | 20170421155525.15012-2-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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.
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
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),
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(-)