Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-octeon.c

diff --git a/drivers/gpio/gpio-octeon.c b/drivers/gpio/gpio-octeon.c
index 7665ebcd0c1d7be77be57338aa2065d63463e3eb..47aead1ed1cc4218378bd13683e627c60728ed05 100644 (file)
--- a/drivers/gpio/gpio-octeon.c
+++ b/drivers/gpio/gpio-octeon.c
@@ -117,7 +117,7 @@ static int octeon_gpio_probe(struct platform_device *pdev)
        chip->get = octeon_gpio_get;
        chip->direction_output = octeon_gpio_dir_out;
        chip->set = octeon_gpio_set;
-       err = gpiochip_add_data(chip, gpio);
+       err = devm_gpiochip_add_data(&pdev->dev, chip, gpio);
        if (err)
                goto out;
 
@@ -126,13 +126,6 @@ out:
        return err;
 }
 
-static int octeon_gpio_remove(struct platform_device *pdev)
-{
-       struct gpio_chip *chip = dev_get_platdata(&pdev->dev);
-       gpiochip_remove(chip);
-       return 0;
-}
-
 static struct of_device_id octeon_gpio_match[] = {
        {
                .compatible = "cavium,octeon-3860-gpio",
@@ -147,7 +140,6 @@ static struct platform_driver octeon_gpio_driver = {
                .of_match_table = octeon_gpio_match,
        },
        .probe          = octeon_gpio_probe,
-       .remove         = octeon_gpio_remove,
 };
 
 module_platform_driver(octeon_gpio_driver);