diff mbox

ASoC: tm2_wm5110: include gpio/consumer.h

Message ID 20170110153104.3143248-1-arnd@arndb.de (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann Jan. 10, 2017, 3:30 p.m. UTC
gpiod_set_value_cansleep is declared in linux/gpio/consumer.h, but that
is not always included implicitly, so we have to include both
gpio.h and gpio/consumer.h here:

sound/soc/samsung/tm2_wm5110.c: In function 'tm2_mic_bias':
sound/soc/samsung/tm2_wm5110.c:220:3: error: implicit declaration of function 'gpiod_set_value_cansleep';did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration]

Fixes: 1bfbc260a5b4 ("ASoC: samsung: Add machine driver for Exynos5433 based TM2 board")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/soc/samsung/tm2_wm5110.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Mark Brown Jan. 10, 2017, 4:40 p.m. UTC | #1
On Tue, Jan 10, 2017 at 04:30:50PM +0100, Arnd Bergmann wrote:
> gpiod_set_value_cansleep is declared in linux/gpio/consumer.h, but that
> is not always included implicitly, so we have to include both
> gpio.h and gpio/consumer.h here:

This doesn't apply against current code, it looks like someone already
made the same change.
Arnd Bergmann Jan. 10, 2017, 4:48 p.m. UTC | #2
On Tue, Jan 10, 2017 at 5:40 PM, Mark Brown <broonie@kernel.org> wrote:
> This doesn't apply against current code, it looks like someone already
> made the same change.Ok, I was sending out m

y final set of patches that I found build-testing v4.10-rc, which
still needs the change,
and have moved on to linux-next testing now.

In case you have queued up that change for v4.11 but not also v4.10,
maybe move it into the fixes branch.

    Arnd
Mark Brown Jan. 10, 2017, 4:59 p.m. UTC | #3
On Tue, Jan 10, 2017 at 05:48:06PM +0100, Arnd Bergmann wrote:

> In case you have queued up that change for v4.11 but not also v4.10,
> maybe move it into the fixes branch.

There's a merge in there as well.
diff mbox

Patch

diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index 5cdf7d19b87f..24cc9d63ce87 100644
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -12,6 +12,7 @@ 
 
 #include <linux/clk.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <sound/pcm_params.h>