[v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
diff mbox series

Message ID 20190809110100.71236-1-yuehaibing@huawei.com
State Accepted
Commit a62bd63893027bfa32fccbba0e0ac067824c362c
Headers show
Series
  • [v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
Related show

Commit Message

YueHaibing Aug. 9, 2019, 11:01 a.m. UTC
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>
Suggested-by: Takashi Iwai <tiwai@suse.de>
Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: remove unused include from hda.c
---
 sound/soc/sof/intel/hda-bus.c | 1 +
 sound/soc/sof/intel/hda.c     | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

Comments

Takashi Iwai Aug. 9, 2019, 12:53 p.m. UTC | #1
On Fri, 09 Aug 2019 13:01:00 +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>
> Suggested-by: Takashi Iwai <tiwai@suse.de>
> Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly")
                       ^
Use " consistently for both opening and closing quotes.

> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Reviewed-by: Takashi Iwai <tiwai@suse.de>


thanks,

Takashi


> ---
> v2: remove unused include from hda.c
> ---
>  sound/soc/sof/intel/hda-bus.c | 1 +
>  sound/soc/sof/intel/hda.c     | 3 ---
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c
> index 0caec3a..1d2babd 100644
> --- a/sound/soc/sof/intel/hda-bus.c
> +++ b/sound/soc/sof/intel/hda-bus.c
> @@ -13,6 +13,7 @@
>  #include "hda.h"
>  
>  #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
> +#include "../../codecs/hdac_hda.h"
>  #define sof_hda_ext_ops	snd_soc_hdac_hda_get_ops()
>  #else
>  #define sof_hda_ext_ops	NULL
> diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
> index 368254b..ebf2777 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>
> -- 
> 2.7.4
> 
> 
>
Takashi Iwai Aug. 9, 2019, 12:55 p.m. UTC | #2
On Fri, 09 Aug 2019 14:53:55 +0200,
Takashi Iwai wrote:
> 
> On Fri, 09 Aug 2019 13:01:00 +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>
> > Suggested-by: Takashi Iwai <tiwai@suse.de>
> > Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly")
>                        ^
> Use " consistently for both opening and closing quotes.
> 
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> 
> Reviewed-by: Takashi Iwai <tiwai@suse.de>

Actually I'm going to take this again on top of
topic/hda-bus-ops-cleanup branch of my tree, so Mark, feel free to
pull onto yours again.

Sorry for the mess!


Takashi
Mark Brown Aug. 9, 2019, 3:11 p.m. UTC | #3
On Fri, Aug 09, 2019 at 02:55:40PM +0200, Takashi Iwai wrote:
> Takashi Iwai wrote:

> > Reviewed-by: Takashi Iwai <tiwai@suse.de>

> Actually I'm going to take this again on top of
> topic/hda-bus-ops-cleanup branch of my tree, so Mark, feel free to
> pull onto yours again.

I think I already applied it locally.
Takashi Iwai Aug. 9, 2019, 3:19 p.m. UTC | #4
On Fri, 09 Aug 2019 17:11:45 +0200,
Mark Brown wrote:
> 
> On Fri, Aug 09, 2019 at 02:55:40PM +0200, Takashi Iwai wrote:
> > Takashi Iwai wrote:
> 
> > > Reviewed-by: Takashi Iwai <tiwai@suse.de>
> 
> > Actually I'm going to take this again on top of
> > topic/hda-bus-ops-cleanup branch of my tree, so Mark, feel free to
> > pull onto yours again.
> 
> I think I already applied it locally.

OK, thanks.  This kind of small fix is fine to be applied doubly :)


Takashi

Patch
diff mbox series

diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c
index 0caec3a..1d2babd 100644
--- a/sound/soc/sof/intel/hda-bus.c
+++ b/sound/soc/sof/intel/hda-bus.c
@@ -13,6 +13,7 @@ 
 #include "hda.h"
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
+#include "../../codecs/hdac_hda.h"
 #define sof_hda_ext_ops	snd_soc_hdac_hda_get_ops()
 #else
 #define sof_hda_ext_ops	NULL
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 368254b..ebf2777 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>