summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-ts4800.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-02-25 14:22:10 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-25 14:22:10 +0100
commit725e3b7d40dffa10dbe0a24ba70676a3127f79fc (patch)
tree3b4cfc0973de0f6459a5a340c997a78ae1dfcdb1 /drivers/gpio/gpio-ts4800.c
parentea1361fd5f26f1dbb369f85b3ad42a84c133e7e1 (diff)
parent9d113c696f4081bf95dd7553d6369998a666b0fa (diff)
downloadlinux-stable-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.tar.gz
linux-stable-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.tar.bz2
linux-stable-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.zip
Merge branch 'devm_gpiochip' of https://github.com/ldewangan/linux-upstream into devm-gpiochip-add-data
Diffstat (limited to 'drivers/gpio/gpio-ts4800.c')
-rw-r--r--drivers/gpio/gpio-ts4800.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-ts4800.c b/drivers/gpio/gpio-ts4800.c
index 147824554253..0c144a72f9af 100644
--- a/drivers/gpio/gpio-ts4800.c
+++ b/drivers/gpio/gpio-ts4800.c
@@ -58,16 +58,7 @@ static int ts4800_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, chip);
- return gpiochip_add_data(chip, NULL);
-}
-
-static int ts4800_gpio_remove(struct platform_device *pdev)
-{
- struct gpio_chip *chip = platform_get_drvdata(pdev);
-
- gpiochip_remove(chip);
-
- return 0;
+ return devm_gpiochip_add_data(&pdev->dev, chip, NULL);
}
static const struct of_device_id ts4800_gpio_of_match[] = {
@@ -81,7 +72,6 @@ static struct platform_driver ts4800_gpio_driver = {
.of_match_table = ts4800_gpio_of_match,
},
.probe = ts4800_gpio_probe,
- .remove = ts4800_gpio_remove,
};
module_platform_driver_probe(ts4800_gpio_driver, ts4800_gpio_probe);