diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 14:22:10 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 14:22:10 +0100 |
commit | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (patch) | |
tree | 3b4cfc0973de0f6459a5a340c997a78ae1dfcdb1 /drivers/gpio/gpio-tps6586x.c | |
parent | gpio: pisosr: Use devm_gpiod_get_optional for gpio->load_gpio (diff) | |
parent | gpio: xgene: Use devm_gpiochip_add_data() for gpio registration (diff) | |
download | linux-dev-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.tar.xz linux-dev-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.zip |
Merge branch 'devm_gpiochip' of https://github.com/ldewangan/linux-upstream into devm-gpiochip-add-data
Diffstat (limited to 'drivers/gpio/gpio-tps6586x.c')
-rw-r--r-- | drivers/gpio/gpio-tps6586x.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c index 87de5486a29e..c88bdc8ee2c9 100644 --- a/drivers/gpio/gpio-tps6586x.c +++ b/drivers/gpio/gpio-tps6586x.c @@ -117,7 +117,8 @@ static int tps6586x_gpio_probe(struct platform_device *pdev) else tps6586x_gpio->gpio_chip.base = -1; - ret = gpiochip_add_data(&tps6586x_gpio->gpio_chip, tps6586x_gpio); + ret = devm_gpiochip_add_data(&pdev->dev, &tps6586x_gpio->gpio_chip, + tps6586x_gpio); if (ret < 0) { dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); return ret; @@ -128,19 +129,10 @@ static int tps6586x_gpio_probe(struct platform_device *pdev) return ret; } -static int tps6586x_gpio_remove(struct platform_device *pdev) -{ - struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev); - - gpiochip_remove(&tps6586x_gpio->gpio_chip); - return 0; -} - static struct platform_driver tps6586x_gpio_driver = { .driver.name = "tps6586x-gpio", .driver.owner = THIS_MODULE, .probe = tps6586x_gpio_probe, - .remove = tps6586x_gpio_remove, }; static int __init tps6586x_gpio_init(void) |