* [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
@ 2019-08-09 11:01 ` YueHaibing
0 siblings, 0 replies; 16+ messages in thread
From: YueHaibing @ 2019-08-09 11:01 UTC (permalink / raw)
To: perex, tiwai, broonie, lgirdwood, pierre-louis.bossart, yang.jie
Cc: linux-kernel, alsa-devel, YueHaibing
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(-)
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
^ permalink raw reply related [flat|nested] 16+ messages in thread* Applied "ASoC: SOF: Intel: Add missing include file hdac_hda.h" to the asoc tree
2019-08-09 11:01 ` YueHaibing
@ 2019-08-09 12:31 ` Mark Brown
-1 siblings, 0 replies; 16+ messages in thread
From: Mark Brown @ 2019-08-09 12:31 UTC (permalink / raw)
To: YueHaibing
Cc: alsa-devel, broonie, Hulk Robot, lgirdwood, linux-kernel,
Mark Brown, perex, pierre-louis.bossart, tiwai, yang.jie
The patch
ASoC: SOF: Intel: Add missing include file hdac_hda.h
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
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 a62bd63893027bfa32fccbba0e0ac067824c362c Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Fri, 9 Aug 2019 19:01:00 +0800
Subject: [PATCH] ASoC: SOF: Intel: Add missing include file hdac_hda.h
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>
Link: https://lore.kernel.org/r/20190809110100.71236-1-yuehaibing@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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 0caec3a070d3..1d2babdda9dd 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 d04844d6b104..28eb780494aa 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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Applied "ASoC: SOF: Intel: Add missing include file hdac_hda.h" to the asoc tree
@ 2019-08-09 12:31 ` Mark Brown
0 siblings, 0 replies; 16+ messages in thread
From: Mark Brown @ 2019-08-09 12:31 UTC (permalink / raw)
To: YueHaibing; +Cc: alsa-devel, broonie, Hulk Robot, lgirdwood, linux-kernel
The patch
ASoC: SOF: Intel: Add missing include file hdac_hda.h
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
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 a62bd63893027bfa32fccbba0e0ac067824c362c Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Fri, 9 Aug 2019 19:01:00 +0800
Subject: [PATCH] ASoC: SOF: Intel: Add missing include file hdac_hda.h
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>
Link: https://lore.kernel.org/r/20190809110100.71236-1-yuehaibing@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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 0caec3a070d3..1d2babdda9dd 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 d04844d6b104..28eb780494aa 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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
2019-08-09 11:01 ` YueHaibing
@ 2019-08-09 12:53 ` Takashi Iwai
-1 siblings, 0 replies; 16+ messages in thread
From: Takashi Iwai @ 2019-08-09 12:53 UTC (permalink / raw)
To: YueHaibing
Cc: lgirdwood, broonie, pierre-louis.bossart, yang.jie, perex,
Takashi Iwai, alsa-devel, linux-kernel
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
>
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
@ 2019-08-09 12:53 ` Takashi Iwai
0 siblings, 0 replies; 16+ messages in thread
From: Takashi Iwai @ 2019-08-09 12:53 UTC (permalink / raw)
To: YueHaibing
Cc: lgirdwood, broonie, pierre-louis.bossart, yang.jie, perex,
Takashi Iwai, alsa-devel, linux-kernel
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
>
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
2019-08-09 12:53 ` Takashi Iwai
@ 2019-08-09 12:55 ` Takashi Iwai
-1 siblings, 0 replies; 16+ messages in thread
From: Takashi Iwai @ 2019-08-09 12:55 UTC (permalink / raw)
To: broonie
Cc: YueHaibing, lgirdwood, pierre-louis.bossart, yang.jie, perex,
Takashi Iwai, alsa-devel, linux-kernel
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
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
@ 2019-08-09 12:55 ` Takashi Iwai
0 siblings, 0 replies; 16+ messages in thread
From: Takashi Iwai @ 2019-08-09 12:55 UTC (permalink / raw)
To: broonie
Cc: YueHaibing, lgirdwood, pierre-louis.bossart, yang.jie, perex,
Takashi Iwai, alsa-devel, linux-kernel
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
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
2019-08-09 12:55 ` Takashi Iwai
(?)
@ 2019-08-09 15:11 ` Mark Brown
2019-08-09 15:19 ` Takashi Iwai
-1 siblings, 1 reply; 16+ messages in thread
From: Mark Brown @ 2019-08-09 15:11 UTC (permalink / raw)
To: Takashi Iwai
Cc: YueHaibing, lgirdwood, pierre-louis.bossart, yang.jie, perex,
Takashi Iwai, alsa-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v2] ASoC: SOF: Intel: Add missing include file hdac_hda.h
2019-08-09 15:11 ` Mark Brown
@ 2019-08-09 15:19 ` Takashi Iwai
0 siblings, 0 replies; 16+ messages in thread
From: Takashi Iwai @ 2019-08-09 15:19 UTC (permalink / raw)
To: Mark Brown
Cc: YueHaibing, lgirdwood, pierre-louis.bossart, yang.jie, perex,
Takashi Iwai, alsa-devel, linux-kernel
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
^ permalink raw reply [flat|nested] 16+ messages in thread