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

[Stephen Rothwell]

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