Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1205687 > unrolled thread

linux-next: build failure after merge of the gpio tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2015-08-12 10:20 +0200
Last post2015-08-13 03:00 +0200
Articles 8 — 3 participants

Back to article view | Back to linux.kernel


Contents

  linux-next: build failure after merge of the gpio tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-12 10:20 +0200
    Re: linux-next: build failure after merge of the gpio tree Uwe Kleine-König   <u.kleine-koenig@pengutronix.de> - 2015-08-12 10:30 +0200
      Re: linux-next: build failure after merge of the gpio tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-12 14:30 +0200
        Re: linux-next: build failure after merge of the gpio tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-12 17:10 +0200
    Re: linux-next: build failure after merge of the gpio tree Uwe Kleine-König   <u.kleine-koenig@pengutronix.de> - 2015-08-12 22:20 +0200
      Re: linux-next: build failure after merge of the gpio tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-13 01:10 +0200
        Re: linux-next: build failure after merge of the gpio tree Chanwoo Choi <cw00.choi@samsung.com> - 2015-08-13 02:20 +0200
          Re: linux-next: build failure after merge of the gpio tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-13 03:00 +0200

#1205687 — linux-next: build failure after merge of the gpio tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-08-12 10:20 +0200
Subjectlinux-next: build failure after merge of the gpio tree
Message-ID<pWzqp-77n-7@gated-at.bofh.it>
Hi Linus,

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

drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
  palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
                         ^
In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
                 from /home/sfr/next/next/include/linux/gpio.h:51,
                 from /home/sfr/next/next/include/linux/of_gpio.h:20,
                 from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
                 from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
/home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
 struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
                                ^

Caused by commit

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

interacting with commit

  92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")

from the extcon tree.

I have applied this merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Aug 2015 18:05:55 +1000
Subject: [PATCH] extcon: palmas: fix for devm_gpiod_get_optional API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/extcon/extcon-palmas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index 662e91778cb0..4ce4106b8f4f 100644
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -208,7 +208,7 @@ static int palmas_usb_probe(struct platform_device *pdev)
 			palmas_usb->wakeup = pdata->wakeup;
 	}
 
-	palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
+	palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id", GPIOD_ASIS);
 	if (IS_ERR(palmas_usb->id_gpiod)) {
 		dev_err(&pdev->dev, "failed to get id gpio\n");
 		return PTR_ERR(palmas_usb->id_gpiod);
-- 
2.5.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1205703

FromUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date2015-08-12 10:30 +0200
Message-ID<pWzA7-7iu-35@gated-at.bofh.it>
In reply to#1205687
Hello Stephen,

On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
> After merging the gpio tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
>   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
>                          ^
> In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
>                  from /home/sfr/next/next/include/linux/gpio.h:51,
>                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
>                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
>                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
> /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
>  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
>                                 ^
> 
> Caused by commit
> 
>   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
> 
> interacting with commit
> 
>   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
I don't find this commit, can you tell me though which tree this comes
into next?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1206012

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-08-12 14:30 +0200
Message-ID<pWDko-4hj-31@gated-at.bofh.it>
In reply to#1205703
Hi Uwe,

On Wed, 12 Aug 2015 10:21:07 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
> > After merging the gpio tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
> >   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> >                          ^
> > In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
> >                  from /home/sfr/next/next/include/linux/gpio.h:51,
> >                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
> >                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
> >                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
> > /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
> >  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
> >                                 ^
> > 
> > Caused by commit
> > 
> >   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
> > 
> > interacting with commit
> > 
> >   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
>
> I don't find this commit, can you tell me though which tree this comes
> into next?

Umm, the next line of that email said:

"from the extcon tree."

:-)

That would be

  git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next

run by Chanwoo Choi.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1206199

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-08-12 17:10 +0200
Message-ID<pWFPd-7Zw-27@gated-at.bofh.it>
In reply to#1206012
Hi Uwe,

On Wed, 12 Aug 2015 22:27:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 12 Aug 2015 10:21:07 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> >
> > On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
> > > After merging the gpio tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > > 
> > > drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
> > >   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> > >                          ^
> > > In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
> > >                  from /home/sfr/next/next/include/linux/gpio.h:51,
> > >                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
> > >                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
> > >                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
> > > /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
> > >  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
> > >                                 ^
> > > 
> > > Caused by commit
> > > 
> > >   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
> > > 
> > > interacting with commit
> > > 
> > >   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
> >
> > I don't find this commit, can you tell me though which tree this comes
> > into next?
> 
> Umm, the next line of that email said:
> 
> "from the extcon tree."
> 
> :-)
> 
> That would be
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
> 
> run by Chanwoo Choi.

Sorry about that, but I hadn't pushed the linux-tree out yet ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1206361

FromUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date2015-08-12 22:20 +0200
Message-ID<pWKFc-6tA-11@gated-at.bofh.it>
In reply to#1205687
Hello,

On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
> After merging the gpio tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
>   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
>                          ^
> In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
>                  from /home/sfr/next/next/include/linux/gpio.h:51,
>                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
>                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
>                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
> /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
>  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
>                                 ^
> 
> Caused by commit
> 
>   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
> 
> interacting with commit
> 
>   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
that commit is not correct. After

	palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");

it does

	palmas_usb->gpio_id_irq = gpiod_to_irq(palmas_usb->id_gpiod);

without setting the gpio to input. So the right fix is not to add
GPIOD_ASIS but GPIOD_IN.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1206408

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-08-13 01:10 +0200
Message-ID<pWNjJ-1Uz-33@gated-at.bofh.it>
In reply to#1206361
Hi Uwe,

On Wed, 12 Aug 2015 22:16:42 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
> > After merging the gpio tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
> >   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> >                          ^
> > In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
> >                  from /home/sfr/next/next/include/linux/gpio.h:51,
> >                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
> >                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
> >                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
> > /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
> >  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
> >                                 ^
> > 
> > Caused by commit
> > 
> >   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
> > 
> > interacting with commit
> > 
> >   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
> that commit is not correct. After
> 
> 	palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> 
> it does
> 
> 	palmas_usb->gpio_id_irq = gpiod_to_irq(palmas_usb->id_gpiod);
> 
> without setting the gpio to input. So the right fix is not to add
> GPIOD_ASIS but GPIOD_IN.

OK, I have fixed my merge fix patch, but can you submit a correct patch
to the extcon tree maintainer, please?  I assume it can be fixed in
that tree right now, right?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1206428

FromChanwoo Choi <cw00.choi@samsung.com>
Date2015-08-13 02:20 +0200
Message-ID<pWOpr-3uI-11@gated-at.bofh.it>
In reply to#1206408
Hi Stephen,

On 08/13/2015 08:02 AM, Stephen Rothwell wrote:
> Hi Uwe,
> 
> On Wed, 12 Aug 2015 22:16:42 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>>
>> On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
>>> After merging the gpio tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
>>>   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
>>>                          ^
>>> In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
>>>                  from /home/sfr/next/next/include/linux/gpio.h:51,
>>>                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
>>>                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
>>>                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
>>> /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
>>>  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
>>>                                 ^
>>>
>>> Caused by commit
>>>
>>>   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
>>>
>>> interacting with commit
>>>
>>>   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
>> that commit is not correct. After
>>
>> 	palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
>>
>> it does
>>
>> 	palmas_usb->gpio_id_irq = gpiod_to_irq(palmas_usb->id_gpiod);
>>
>> without setting the gpio to input. So the right fix is not to add
>> GPIOD_ASIS but GPIOD_IN.
> 
> OK, I have fixed my merge fix patch, but can you submit a correct patch
> to the extcon tree maintainer, please?  I assume it can be fixed in
> that tree right now, right?
> 

I'll fix it as Uwe comment as following:

--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -208,7 +208,8 @@ static int palmas_usb_probe(struct platform_device *pdev)
                        palmas_usb->wakeup = pdata->wakeup;
        }
 
-       palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
+       palmas_usb->id_gpiod =
+               devm_gpiod_get_optional(&pdev->dev, "id", GPIOD_IN);
        if (IS_ERR(palmas_usb->id_gpiod)) {
                dev_err(&pdev->dev, "failed to get id gpio\n");
                return PTR_ERR(palmas_usb->id_gpiod);

I'll send it to LKML and apply it on extcon-next tree.

Thanks,
Chanwoo Choi

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1206455

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-08-13 03:00 +0200
Message-ID<pWP2b-4fa-39@gated-at.bofh.it>
In reply to#1206428
Hi Chanwoo,

On Thu, 13 Aug 2015 09:19:12 +0900 Chanwoo Choi <cw00.choi@samsung.com> wrote:
>
> Hi Stephen,
> 
> On 08/13/2015 08:02 AM, Stephen Rothwell wrote:
> > Hi Uwe,
> > 
> > On Wed, 12 Aug 2015 22:16:42 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> >>
> >> On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote:
> >>> After merging the gpio tree, today's linux-next build (powerpc
> >>> allyesconfig) failed like this:
> >>>
> >>> drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional'
> >>>   palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> >>>                          ^
> >>> In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0,
> >>>                  from /home/sfr/next/next/include/linux/gpio.h:51,
> >>>                  from /home/sfr/next/next/include/linux/of_gpio.h:20,
> >>>                  from /home/sfr/next/next/include/linux/mfd/palmas.h:24,
> >>>                  from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28:
> >>> /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here
> >>>  struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev,
> >>>                                 ^
> >>>
> >>> Caused by commit
> >>>
> >>>   b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
> >>>
> >>> interacting with commit
> >>>
> >>>   92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection")
> >> that commit is not correct. After
> >>
> >> 	palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> >>
> >> it does
> >>
> >> 	palmas_usb->gpio_id_irq = gpiod_to_irq(palmas_usb->id_gpiod);
> >>
> >> without setting the gpio to input. So the right fix is not to add
> >> GPIOD_ASIS but GPIOD_IN.
> > 
> > OK, I have fixed my merge fix patch, but can you submit a correct patch
> > to the extcon tree maintainer, please?  I assume it can be fixed in
> > that tree right now, right?
> > 
> 
> I'll fix it as Uwe comment as following:
> 
> --- a/drivers/extcon/extcon-palmas.c
> +++ b/drivers/extcon/extcon-palmas.c
> @@ -208,7 +208,8 @@ static int palmas_usb_probe(struct platform_device *pdev)
>                         palmas_usb->wakeup = pdata->wakeup;
>         }
>  
> -       palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id");
> +       palmas_usb->id_gpiod =
> +               devm_gpiod_get_optional(&pdev->dev, "id", GPIOD_IN);
>         if (IS_ERR(palmas_usb->id_gpiod)) {
>                 dev_err(&pdev->dev, "failed to get id gpio\n");
>                 return PTR_ERR(palmas_usb->id_gpiod);
> 
> I'll send it to LKML and apply it on extcon-next tree.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web