summaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2022-09-27 17:29:42 +0200
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2022-09-27 21:29:08 +0200
commitbf21f3f8d0336ec28d9ab09ad274ac0bd71b7cf8 (patch)
tree3a158cd18998476346ccb47ef5b4891b76a9a0b3 /arch/mips/lantiq
parentMIPS: IRQ: remove orphan allocate_irqno() declaration (diff)
downloadlinux-bf21f3f8d0336ec28d9ab09ad274ac0bd71b7cf8.tar.xz
linux-bf21f3f8d0336ec28d9ab09ad274ac0bd71b7cf8.zip
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: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/lantiq')
-rw-r--r--arch/mips/lantiq/xway/vmmc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c
index a1947306ac18..2796e87dfcae 100644
--- a/arch/mips/lantiq/xway/vmmc.c
+++ b/arch/mips/lantiq/xway/vmmc.c
@@ -29,6 +29,7 @@ static int vmmc_probe(struct platform_device *pdev)
struct gpio_desc *gpio;
int gpio_count;
dma_addr_t dma;
+ int error;
cp1_base =
(void *) CPHYSADDR(dma_alloc_coherent(&pdev->dev, CP1_SIZE,
@@ -38,14 +39,15 @@ static int vmmc_probe(struct platform_device *pdev)
while (gpio_count > 0) {
gpio = devm_gpiod_get_index(&pdev->dev,
NULL, --gpio_count, GPIOD_OUT_HIGH);
- if (IS_ERR(gpio)) {
+ error = PTR_ERR_OR_ZERO(gpio);
+ if (error) {
dev_err(&pdev->dev,
"failed to request GPIO idx %d: %d\n",
- gpio_count, PTR_ERR(gpio);
+ gpio_count, error);
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);