Commit bf21f3f8 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Thomas Bogendoerfer

MIPS: Lantiq: vmmc: fix compile break introduced by gpiod patch

"MIPS: Lantiq: switch vmmc to use gpiod API" patch introduced compile
errors, this patch fixes them.
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent fe23057c
...@@ -29,6 +29,7 @@ static int vmmc_probe(struct platform_device *pdev) ...@@ -29,6 +29,7 @@ static int vmmc_probe(struct platform_device *pdev)
struct gpio_desc *gpio; struct gpio_desc *gpio;
int gpio_count; int gpio_count;
dma_addr_t dma; dma_addr_t dma;
int error;
cp1_base = cp1_base =
(void *) CPHYSADDR(dma_alloc_coherent(&pdev->dev, CP1_SIZE, (void *) CPHYSADDR(dma_alloc_coherent(&pdev->dev, CP1_SIZE,
...@@ -38,14 +39,15 @@ static int vmmc_probe(struct platform_device *pdev) ...@@ -38,14 +39,15 @@ static int vmmc_probe(struct platform_device *pdev)
while (gpio_count > 0) { while (gpio_count > 0) {
gpio = devm_gpiod_get_index(&pdev->dev, gpio = devm_gpiod_get_index(&pdev->dev,
NULL, --gpio_count, GPIOD_OUT_HIGH); NULL, --gpio_count, GPIOD_OUT_HIGH);
if (IS_ERR(gpio)) { error = PTR_ERR_OR_ZERO(gpio);
if (error) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to request GPIO idx %d: %d\n", "failed to request GPIO idx %d: %d\n",
gpio_count, PTR_ERR(gpio); gpio_count, error);
continue; continue;
} }
gpio_consumer_set_name(gpio, "vmmc-relay"); gpiod_set_consumer_name(gpio, "vmmc-relay");
} }
dev_info(&pdev->dev, "reserved %dMB at 0x%p", CP1_SIZE >> 20, cp1_base); dev_info(&pdev->dev, "reserved %dMB at 0x%p", CP1_SIZE >> 20, cp1_base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment