Messages in this thread Patch in this message | | | Date | Tue, 21 Jul 2015 13:29:45 +1000 | From | Stephen Rothwell <> | 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/regulator/rk808-regulator.c: In function 'rk808_regulator_dt_parse_pdata': drivers/regulator/rk808-regulator.c:543:24: error: too few arguments to function 'gpiod_get_index' pdata->dvs_gpio[i] = gpiod_get_index(client_dev, "dvs", i); ^ In file included from include/asm-generic/gpio.h:13:0, from include/linux/gpio.h:51, from drivers/regulator/rk808-regulator.c:20: include/linux/gpio/consumer.h:53:32: note: declared here struct gpio_desc *__must_check gpiod_get_index(struct device *dev, ^
Caused by commit
bad47ad2eef3 ("regulator: rk808: fixed the overshoot when adjust voltage")
from the regulator tree interactings with commit
b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions")
from the gpio tree.
I added teh following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 21 Jul 2015 13:23:56 +1000 Subject: [PATCH] regulator: rk808: fix up for gpiod_get_index() API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/regulator/rk808-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index ca913fd15598..cfec52c1a4a2 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -540,7 +540,7 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, goto dt_parse_end; for (i = 0; i < ARRAY_SIZE(pdata->dvs_gpio); i++) { - pdata->dvs_gpio[i] = gpiod_get_index(client_dev, "dvs", i); + pdata->dvs_gpio[i] = gpiod_get_index(client_dev, "dvs", i, GPIOD_ASIS); if (IS_ERR(pdata->dvs_gpio[i])) { dev_warn(dev, "there is no dvs%d gpio\n", i); continue; -- 2.1.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |