Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / gpio / gpio-tps65218.c

diff --git a/drivers/gpio/gpio-tps65218.c b/drivers/gpio/gpio-tps65218.c
index 1c09a19..d779307 100644 (file)
--- a/drivers/gpio/gpio-tps65218.c
+++ b/drivers/gpio/gpio-tps65218.c
@@ -172,7 +172,7 @@ static int tps65218_gpio_set_single_ended(struct gpio_chip *gc,
        return -ENOTSUPP;
 }
 
-static struct gpio_chip template_chip = {
+static const struct gpio_chip template_chip = {
        .label                  = "gpio-tps65218",
        .owner                  = THIS_MODULE,
        .request                = tps65218_gpio_request,
@@ -204,7 +204,8 @@ static int tps65218_gpio_probe(struct platform_device *pdev)
        tps65218_gpio->gpio_chip.of_node = pdev->dev.of_node;
 #endif
 
-       ret = gpiochip_add_data(&tps65218_gpio->gpio_chip, tps65218_gpio);
+       ret = devm_gpiochip_add_data(&pdev->dev, &tps65218_gpio->gpio_chip,
+                                    tps65218_gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
                return ret;
@@ -215,15 +216,6 @@ static int tps65218_gpio_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int tps65218_gpio_remove(struct platform_device *pdev)
-{
-       struct tps65218_gpio *tps65218_gpio = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&tps65218_gpio->gpio_chip);
-
-       return 0;
-}
-
 static const struct of_device_id tps65218_dt_match[] = {
        { .compatible = "ti,tps65218-gpio" },
        {  }
@@ -242,7 +234,6 @@ static struct platform_driver tps65218_gpio_driver = {
                .of_match_table = of_match_ptr(tps65218_dt_match)
        },
        .probe = tps65218_gpio_probe,
-       .remove = tps65218_gpio_remove,
        .id_table = tps65218_gpio_id_table,
 };