diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 10:41:41 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 10:41:41 +0300 |
| commit | 016bf20829fa00f5e64805f77b7677365151f4af (patch) | |
| tree | 5ef012a06aaa59e7ee5bbed984322f0a97c37309 /drivers/gpio/gpio-ts5500.c | |
| parent | a961f9b472de93e770d53b7340a58dbff64b4075 (diff) | |
| parent | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (diff) | |
| download | linux-016bf20829fa00f5e64805f77b7677365151f4af.tar.xz | |
Merge branch 'devm-gpiochip-add-data' into devel
Diffstat (limited to 'drivers/gpio/gpio-ts5500.c')
| -rw-r--r-- | drivers/gpio/gpio-ts5500.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c index 5f945083f9d8..6cfeba07f882 100644 --- a/drivers/gpio/gpio-ts5500.c +++ b/drivers/gpio/gpio-ts5500.c @@ -409,7 +409,7 @@ static int ts5500_dio_probe(struct platform_device *pdev) break; } - ret = gpiochip_add_data(&priv->gpio_chip, priv); + ret = devm_gpiochip_add_data(dev, &priv->gpio_chip, priv); if (ret) { dev_err(dev, "failed to register the gpio chip\n"); return ret; @@ -418,13 +418,10 @@ static int ts5500_dio_probe(struct platform_device *pdev) ret = ts5500_enable_irq(priv); if (ret) { dev_err(dev, "invalid interrupt %d\n", priv->hwirq); - goto cleanup; + return ret; } return 0; -cleanup: - gpiochip_remove(&priv->gpio_chip); - return ret; } static int ts5500_dio_remove(struct platform_device *pdev) @@ -432,7 +429,7 @@ static int ts5500_dio_remove(struct platform_device *pdev) struct ts5500_priv *priv = platform_get_drvdata(pdev); ts5500_disable_irq(priv); - gpiochip_remove(&priv->gpio_chip); + return 0; } |