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

gpio: dln2: Use devm_gpiochip_add_data() for gpio registration

Browse Source 
Use devm_gpiochip_add_data() for GPIO registration.

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

16
drivers/gpio/gpio-dln2.c
View File

@@ -479,40 +479,32 @@ static int dln2_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dln2); platform_set_drvdata(pdev, dln2);
ret = gpiochip_add_data(&dln2->gpio, dln2); ret = devm_gpiochip_add_data(dev, &dln2->gpio, dln2);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to add gpio chip: %d\n", ret); dev_err(dev, "failed to add gpio chip: %d\n", ret);
goto out; return ret;
} }
ret = gpiochip_irqchip_add(&dln2->gpio, &dln2_gpio_irqchip, 0, ret = gpiochip_irqchip_add(&dln2->gpio, &dln2_gpio_irqchip, 0,
handle_simple_irq, IRQ_TYPE_NONE); handle_simple_irq, IRQ_TYPE_NONE);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to add irq chip: %d\n", ret); dev_err(dev, "failed to add irq chip: %d\n", ret);
goto out_gpiochip_remove; return ret;
} }
ret = dln2_register_event_cb(pdev, DLN2_GPIO_CONDITION_MET_EV, ret = dln2_register_event_cb(pdev, DLN2_GPIO_CONDITION_MET_EV,
dln2_gpio_event); dln2_gpio_event);
if (ret) { if (ret) {
dev_err(dev, "failed to register event cb: %d\n", ret); dev_err(dev, "failed to register event cb: %d\n", ret);
goto out_gpiochip_remove; return ret;
} }
return 0; return 0;
out_gpiochip_remove:
gpiochip_remove(&dln2->gpio);
out:
return ret;
} }
static int dln2_gpio_remove(struct platform_device *pdev) static int dln2_gpio_remove(struct platform_device *pdev)
{ {
struct dln2_gpio *dln2 = platform_get_drvdata(pdev);
dln2_unregister_event_cb(pdev, DLN2_GPIO_CONDITION_MET_EV); dln2_unregister_event_cb(pdev, DLN2_GPIO_CONDITION_MET_EV);
gpiochip_remove(&dln2->gpio);
return 0; return 0;
} }