xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: vf610: Use devres to remove gpiochip

Browse Source 
Now that the driver's custom remove hook contains only a single
action, replace it by converting the code to use
devm_gpiochip_add_data() to simplify things.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
Andrey Smirnov
2019-03-10 23:27:36 -07:00
committed by Bartosz Golaszewski
parent fc57949cfd
commit a74b4b1154
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpio/gpio-vf610.c
View File

@@ -297,8 +297,6 @@ static int vf610_gpio_probe(struct platform_device *pdev)
return PTR_ERR(port->clk_gpio); return PTR_ERR(port->clk_gpio);
} }
platform_set_drvdata(pdev, port);
gc = &port->gc; gc = &port->gc;
gc->of_node = np; gc->of_node = np;
gc->parent = dev; gc->parent = dev;
@@ -321,7 +319,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
ic->irq_set_type = vf610_gpio_irq_set_type; ic->irq_set_type = vf610_gpio_irq_set_type;
ic->irq_set_wake = vf610_gpio_irq_set_wake; ic->irq_set_wake = vf610_gpio_irq_set_wake;
ret = gpiochip_add_data(gc, port); ret = devm_gpiochip_add_data(dev, gc, port);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -335,7 +333,6 @@ static int vf610_gpio_probe(struct platform_device *pdev)
ret = gpiochip_irqchip_add(gc, ic, 0, handle_edge_irq, IRQ_TYPE_NONE); ret = gpiochip_irqchip_add(gc, ic, 0, handle_edge_irq, IRQ_TYPE_NONE);
if (ret) { if (ret) {
dev_err(dev, "failed to add irqchip\n"); dev_err(dev, "failed to add irqchip\n");
gpiochip_remove(gc);
return ret; return ret;
} }
gpiochip_set_chained_irqchip(gc, ic, port->irq, gpiochip_set_chained_irqchip(gc, ic, port->irq,
@@ -344,22 +341,12 @@ static int vf610_gpio_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int vf610_gpio_remove(struct platform_device *pdev)
{
struct vf610_gpio_port *port = platform_get_drvdata(pdev);
gpiochip_remove(&port->gc);
return 0;
}
static struct platform_driver vf610_gpio_driver = { static struct platform_driver vf610_gpio_driver = {
.driver = { .driver = {
.name = "gpio-vf610", .name = "gpio-vf610",
.of_match_table = vf610_gpio_dt_ids, .of_match_table = vf610_gpio_dt_ids,
}, },
.probe = vf610_gpio_probe, .probe = vf610_gpio_probe,
.remove = vf610_gpio_remove,
}; };
builtin_platform_driver(vf610_gpio_driver); builtin_platform_driver(vf610_gpio_driver);