From: Takashi Iwai <tiwai@suse.de> To: YueHaibing <yuehaibing@huawei.com> Cc: <lgirdwood@gmail.com>, <broonie@kernel.org>, <pierre-louis.bossart@linux.intel.com>, <yang.jie@linux.intel.com>, <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] ASoC: SOF: Intel: Add missing include file hdac_hda.h Date: Fri, 09 Aug 2019 12:04:23 +0200 [thread overview] Message-ID: <s5hh86qhcyg.wl-tiwai@suse.de> (raw) In-Reply-To: <20190809095550.71040-1-yuehaibing@huawei.com> On Fri, 09 Aug 2019 11:55:50 +0200, YueHaibing wrote: > > Building with SND_SOC_SOF_HDA_AUDIO_CODEC fails: > > sound/soc/sof/intel/hda-bus.c: In function sof_hda_bus_init: > sound/soc/sof/intel/hda-bus.c:16:25: error: implicit declaration of function > snd_soc_hdac_hda_get_ops; did you mean snd_soc_jack_add_gpiods? [-Werror=implicit-function-declaration] > #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() > > Reported-by: Hulk Robot <hulkci@huawei.com> > Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Damn, it seems another oversight. And now the inclusion in sound/soc/sof/intel/hda.c is superfluous, too, so we should just move like diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c index 0caec3a070d3..2b384134a3db 100644 --- a/sound/soc/sof/intel/hda-bus.c +++ b/sound/soc/sof/intel/hda-bus.c @@ -11,6 +11,9 @@ #include <sound/hdaudio.h> #include "../sof-priv.h" #include "hda.h" +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) +#include "../../codecs/hdac_hda.h" +#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 7ca27000c34d..dd6c8ad62b3e 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -23,9 +23,6 @@ #include <sound/sof/xtensa.h> #include "../ops.h" #include "hda.h" -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) -#include "../../codecs/hdac_hda.h" -#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) #include <sound/soc-acpi-intel-match.h> Could you check whether this works instead? BTW, the inclusion of "../../codecs/hdac_hdac.h" is very ugly... In general if a header file is referred from another driver, it should be in a more public place under include/sound. If any, we can create a subdirectory like include/sound/codecs. thanks, Takashi
WARNING: multiple messages have this Message-ID (diff)
From: Takashi Iwai <tiwai@suse.de> To: YueHaibing <yuehaibing@huawei.com> Cc: lgirdwood@gmail.com, broonie@kernel.org, pierre-louis.bossart@linux.intel.com, yang.jie@linux.intel.com, perex@perex.cz, Takashi Iwai <tiwai@suse.com>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ASoC: SOF: Intel: Add missing include file hdac_hda.h Date: Fri, 09 Aug 2019 12:04:23 +0200 [thread overview] Message-ID: <s5hh86qhcyg.wl-tiwai@suse.de> (raw) In-Reply-To: <20190809095550.71040-1-yuehaibing@huawei.com> On Fri, 09 Aug 2019 11:55:50 +0200, YueHaibing wrote: > > Building with SND_SOC_SOF_HDA_AUDIO_CODEC fails: > > sound/soc/sof/intel/hda-bus.c: In function sof_hda_bus_init: > sound/soc/sof/intel/hda-bus.c:16:25: error: implicit declaration of function > snd_soc_hdac_hda_get_ops; did you mean snd_soc_jack_add_gpiods? [-Werror=implicit-function-declaration] > #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() > > Reported-by: Hulk Robot <hulkci@huawei.com> > Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Damn, it seems another oversight. And now the inclusion in sound/soc/sof/intel/hda.c is superfluous, too, so we should just move like diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c index 0caec3a070d3..2b384134a3db 100644 --- a/sound/soc/sof/intel/hda-bus.c +++ b/sound/soc/sof/intel/hda-bus.c @@ -11,6 +11,9 @@ #include <sound/hdaudio.h> #include "../sof-priv.h" #include "hda.h" +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) +#include "../../codecs/hdac_hda.h" +#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 7ca27000c34d..dd6c8ad62b3e 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -23,9 +23,6 @@ #include <sound/sof/xtensa.h> #include "../ops.h" #include "hda.h" -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) -#include "../../codecs/hdac_hda.h" -#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) #include <sound/soc-acpi-intel-match.h> Could you check whether this works instead? BTW, the inclusion of "../../codecs/hdac_hdac.h" is very ugly... In general if a header file is referred from another driver, it should be in a more public place under include/sound. If any, we can create a subdirectory like include/sound/codecs. thanks, Takashi
next prev parent reply other threads:[~2019-08-09 10:04 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 9:55 [PATCH] ASoC: SOF: Intel: Add missing include file hdac_hda.h YueHaibing 2019-08-09 9:55 ` YueHaibing 2019-08-09 10:04 ` Takashi Iwai [this message] 2019-08-09 10:04 ` Takashi Iwai 2019-08-09 10:52 ` Yuehaibing 2019-08-09 10:52 ` Yuehaibing 2019-08-09 11:01 ` [PATCH v2] " YueHaibing 2019-08-09 11:01 ` YueHaibing 2019-08-09 12:31 ` Applied "ASoC: SOF: Intel: Add missing include file hdac_hda.h" to the asoc tree Mark Brown 2019-08-09 12:31 ` Mark Brown 2019-08-09 12:53 ` [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h Takashi Iwai 2019-08-09 12:53 ` Takashi Iwai 2019-08-09 12:55 ` Takashi Iwai 2019-08-09 12:55 ` Takashi Iwai 2019-08-09 15:11 ` Mark Brown 2019-08-09 15:19 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=s5hh86qhcyg.wl-tiwai@suse.de \ --to=tiwai@suse.de \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=tiwai@suse.com \ --cc=yang.jie@linux.intel.com \ --cc=yuehaibing@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.