openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

extcon: palmas: Fix build break due to devm_gpiod_get_optional API change 

With commit b17d1bf16c ("gpio: make flags mandatory for gpiod_get functions")
it becomes necessary to pass the flags argument. And this patch adds the gpio
header file to fix the build breakage when build testing with random
configuration files.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Chanwoo Choi 2015-08-13 09:19:43 +09:00
parent 92b7cb5dc8
commit ac22a1d338
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/extcon/extcon-palmas.c
View File

@ -29,6 +29,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#define USB_GPIO_DEBOUNCE_MS 20 /* ms */ #define USB_GPIO_DEBOUNCE_MS 20 /* ms */
@ -208,7 +209,8 @@ static int palmas_usb_probe(struct platform_device *pdev)
palmas_usb->wakeup = pdata->wakeup; 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)) { if (IS_ERR(palmas_usb->id_gpiod)) {
dev_err(&pdev->dev, "failed to get id gpio\n"); dev_err(&pdev->dev, "failed to get id gpio\n");
return PTR_ERR(palmas_usb->id_gpiod); return PTR_ERR(palmas_usb->id_gpiod);