hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: mxc: Use devm_gpiochip_add_data() for gpio registration 

Use devm_gpiochip_add_data() for GPIO registration and clean the
error path.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Laxman Dewangan 2016-02-22 17:43:28 +05:30
parent 00b9ab4a25
commit ffc566303e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpio/gpio-mxc.c
View File

@ -462,14 +462,14 @@ static int mxc_gpio_probe(struct platform_device *pdev)
port->gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 : port->gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 :
pdev->id * 32; pdev->id * 32;
err = gpiochip_add_data(&port->gc, port); err = devm_gpiochip_add_data(&pdev->dev, &port->gc, port);
if (err) if (err)
goto out_bgio; goto out_bgio;
irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id()); irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());
if (irq_base < 0) { if (irq_base < 0) {
err = irq_base; err = irq_base;
goto out_gpiochip_remove; goto out_bgio;
} }
port->domain = irq_domain_add_legacy(np, 32, irq_base, 0, port->domain = irq_domain_add_legacy(np, 32, irq_base, 0,
@ -492,8 +492,6 @@ out_irqdomain_remove:
irq_domain_remove(port->domain); irq_domain_remove(port->domain);
out_irqdesc_free: out_irqdesc_free:
irq_free_descs(irq_base, 32); irq_free_descs(irq_base, 32);
out_gpiochip_remove:
gpiochip_remove(&port->gc);
out_bgio: out_bgio:
dev_info(&pdev->dev, "%s failed with errno %d\n", __func__, err); dev_info(&pdev->dev, "%s failed with errno %d\n", __func__, err);
return err; return err;