2015-08-18 06:57:22

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the gpio tree

Hi Linus,

After merging the gpio tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/i2c/tc358743.c: In function 'tc358743_probe_of':
drivers/media/i2c/tc358743.c:1786:22: error: too few arguments to function 'devm_gpiod_get'
state->reset_gpio = devm_gpiod_get(dev, "reset");
^
In file included from drivers/media/i2c/tc358743.c:34:0:
include/linux/gpio/consumer.h:73:32: note: declared here
struct gpio_desc *__must_check devm_gpiod_get(struct device *dev,
^

Caused by commit

b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")

interacting with commit

256148246852 ("[media] tc358743: support probe from device tree")

from the v4l-dvb tree.

I have added the following fix patch for today:

From: Stephen Rothwell <[email protected]>
Date: Tue, 18 Aug 2015 16:53:21 +1000
Subject: [PATCH] [media] tc358743: fix for devm_gpiod_get API change

Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/media/i2c/tc358743.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
index fe42c9a1cb78..8f7641164d9d 100644
--- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c
@@ -1783,7 +1783,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
state->pdata.ths_trailcnt = 0x2;
state->pdata.hstxvregcnt = 0;

- state->reset_gpio = devm_gpiod_get(dev, "reset");
+ state->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_ASIS);
if (IS_ERR(state->reset_gpio)) {
dev_err(dev, "failed to get reset gpio\n");
ret = PTR_ERR(state->reset_gpio);
--
2.5.0

--
Cheers,
Stephen Rothwell [email protected]


2015-08-18 12:00:30

by Linus Walleij

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the gpio tree

On Tue, Aug 18, 2015 at 8:57 AM, Stephen Rothwell <[email protected]> wrote:

> Hi Linus,
>
> After merging the gpio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/i2c/tc358743.c: In function 'tc358743_probe_of':
> drivers/media/i2c/tc358743.c:1786:22: error: too few arguments to function 'devm_gpiod_get'
> state->reset_gpio = devm_gpiod_get(dev, "reset");
> ^
> In file included from drivers/media/i2c/tc358743.c:34:0:
> include/linux/gpio/consumer.h:73:32: note: declared here
> struct gpio_desc *__must_check devm_gpiod_get(struct device *dev,
> ^

Argh.

> I have added the following fix patch for today:
>
> From: Stephen Rothwell <[email protected]>
> Date: Tue, 18 Aug 2015 16:53:21 +1000
> Subject: [PATCH] [media] tc358743: fix for devm_gpiod_get API change
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> drivers/media/i2c/tc358743.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
> index fe42c9a1cb78..8f7641164d9d 100644
> --- a/drivers/media/i2c/tc358743.c
> +++ b/drivers/media/i2c/tc358743.c
> @@ -1783,7 +1783,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
> state->pdata.ths_trailcnt = 0x2;
> state->pdata.hstxvregcnt = 0;
>
> - state->reset_gpio = devm_gpiod_get(dev, "reset");
> + state->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_ASIS);
> if (IS_ERR(state->reset_gpio)) {
> dev_err(dev, "failed to get reset gpio\n");
> ret = PTR_ERR(state->reset_gpio);

This is likely the correct solution. Mauro, can you apply Stephen's
patch to your media tree?

Yours,
Linus Walleij

2015-08-18 12:23:39

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the gpio tree

Hello Linus,

I forgot to add you (and also Stephen) to Cc for my slightly different
patch. You can find it at https://patchwork.linuxtv.org/patch/30908/.

I just sent you and Stephen a bounce if you want to comment.

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

2015-08-18 13:35:35

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the gpio tree

Em Tue, 18 Aug 2015 14:23:26 +0200
Uwe Kleine-König <[email protected]> escreveu:

> Hello Linus,
>
> I forgot to add you (and also Stephen) to Cc for my slightly different
> patch. You can find it at https://patchwork.linuxtv.org/patch/30908/.
>
> I just sent you and Stephen a bounce if you want to comment.

My plan is to either apply Stephen or Uwe version at media latter this week,
after giving some time for people to review it.

Regards,
Mauro