Skip to contentSkip to conversation

ASoC: codecs: Fix build error

PATCH In review Hui Tang 2 participants 4 messages May 12, 2022

Subsystems (3)
lore
Share & tools
lore

Hui Tang

author
#0 lore raw

v2 cover ASoC: codecs: Fix build error

Fix two build error, as follows:

Changes in v2:
* Add missing header files instead of adding dependencies.

Hui Tang (2):
ASoC: max98396: Fix build error for implicit function declaration
ASoC: tlv320adc3xxx: Fix build error for implicit function declaration

 sound/soc/codecs/max98396.c      | 1 +
 sound/soc/codecs/tlv320adc3xxx.c | 3 +++
 2 files changed, 4 insertions(+)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/2 ASoC: max98396: Fix build error for implicit function declaration

sound/soc/codecs/max98396.c: In function ‘max98396_i2c_probe’:
sound/soc/codecs/max98396.c:1555:25: error: implicit declaration of function ‘devm_gpiod_get_optional’; did you mean ‘devm_regulator_get_optional’? [-Werror=implicit-function-declaration]
max98396->reset_gpio = devm_gpiod_get_optional(&i2c->dev,

                         ^~~~~~~~~~~~~~~~~~~~~~~
                         devm_regulator_get_optional
sound/soc/codecs/max98396.c:1556:23: error: ‘GPIOD_OUT_HIGH’ undeclared (first use in this function); did you mean ‘GPIOF_INIT_HIGH’?
              "reset", GPIOD_OUT_HIGH);
                       ^~~~~~~~~~~~~~
                       GPIOF_INIT_HIGH

sound/soc/codecs/max98396.c:1556:23: note: each undeclared identifier is reported only once for each function it appears in sound/soc/codecs/max98396.c:1565:3: error: implicit declaration of function ‘gpiod_set_value_cansleep’; did you mean ‘gpio_set_value_cansleep’? [-Werror=implicit-function-declaration]
gpiod_set_value_cansleep(max98396->reset_gpio, 0);
^~~~~~~~~~~~~~~~~~~~~~~~
gpio_set_value_cansleep
cc1: all warnings being treated as errors

Include header file <linux/gpio/consumer.h>

Fixes b58581136770 ("ASoC: max98396: add amplifier driver")

---
Changes in v2:
* Add missing header files instead of adding dependencies

 sound/soc/codecs/max98396.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/codecs/max98396.c +1 -0
index 745d7e761680..56eb62bb041f 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2022, Analog Devices Inc.
 
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <sound/pcm_params.h>
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v2 2/2 ASoC: tlv320adc3xxx: Fix build error for implicit function declaration

In reply to Hui Tang

sound/soc/codecs/tlv320adc3xxx.c: In function ‘adc3xxx_i2c_probe’:
sound/soc/codecs/tlv320adc3xxx.c:1359:21: error: implicit declaration of function ‘devm_gpiod_get’; did you mean ‘devm_gpio_free’? [-Werror=implicit-function-declaration]

  adc3xxx->rst_pin = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
                     ^~~~~~~~~~~~~~
                     devm_gpio_free
  CC [M]  drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.o
  LD [M]  sound/soc/codecs/snd-soc-ak4671.o
  LD [M]  sound/soc/codecs/snd-soc-arizona.o
  LD [M]  sound/soc/codecs/snd-soc-cros-ec-codec.o
  LD [M]  sound/soc/codecs/snd-soc-ak4641.o
  LD [M]  sound/soc/codecs/snd-soc-alc5632.o
sound/soc/codecs/tlv320adc3xxx.c:1359:50: error: ‘GPIOD_OUT_LOW’ undeclared (first use in this function); did you mean ‘GPIOF_INIT_LOW’?
  adc3xxx->rst_pin = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
                                                  ^~~~~~~~~~~~~
                                                  GPIOF_INIT_LOW

sound/soc/codecs/tlv320adc3xxx.c:1359:50: note: each undeclared identifier is reported only once for each function it appears in
LD [M] sound/soc/codecs/snd-soc-cs35l32.o
sound/soc/codecs/tlv320adc3xxx.c:1408:2: error: implicit declaration of function ‘gpiod_set_value_cansleep’; did you mean ‘gpio_set_value_cansleep’? [-Werror=implicit-function-declaration]
gpiod_set_value_cansleep(adc3xxx->rst_pin, 1);
^~~~~~~~~~~~~~~~~~~~~~~~
gpio_set_value_cansleep

  LD [M]  sound/soc/codecs/snd-soc-cs35l41-lib.o
  LD [M]  sound/soc/codecs/snd-soc-cs35l36.o
  LD [M]  sound/soc/codecs/snd-soc-cs35l34.o
  LD [M]  sound/soc/codecs/snd-soc-cs35l41.o
  CC [M]  drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.o

cc1: all warnings being treated as errors

Fixes e9a3b57efd28 ("ASoC: codec: tlv320adc3xxx: New codec driver")

---
Changes in v2:
* Add missing header files instead of adding dependencies
* Calling 'gpiochip_remove' depends on 'CONFIG_GPIOLIB' enabled

 sound/soc/codecs/tlv320adc3xxx.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/codecs/tlv320adc3xxx.c +3 -0
index a5e9f80cfa32..80b8115e6053 100644
@@ -14,6 +14,7 @@
 
 #include <dt-bindings/sound/tlv320adc3xxx.h>
 #include <linux/clk.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/io.h>
@@ -1025,7 +1026,9 @@ static const struct gpio_chip adc3xxx_gpio_chip = {
 
 static void adc3xxx_free_gpio(struct adc3xxx *adc3xxx)
 {
+#ifdef CONFIG_GPIOLIB
 	gpiochip_remove(&adc3xxx->gpio_chip);
+#endif
 }
 
 static void adc3xxx_init_gpio(struct adc3xxx *adc3xxx)
Signature · 1 line
2.17.1
maintainer
#3 lore raw
In reply to Hui Tang
Quoted 10 lines · Hui Tang

Fix two build error, as follows:

Changes in v2:
* Add missing header files instead of adding dependencies.

Hui Tang (2):
ASoC: max98396: Fix build error for implicit function declaration
ASoC: tlv320adc3xxx: Fix build error for implicit function declaration

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: max98396: Fix build error for implicit function declaration
(no commit info)
[2/2] ASoC: tlv320adc3xxx: Fix build error for implicit function declaration

      commit: 19c5bda74dc45fee598a57600b550c9ea7662f10

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