PM / devfreq: rk3399_dmc: rename driver and internals to rockchip

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-tps65912.c

diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index 84573046994543145895431996385237b48d3cc0..9cdbc0c9cb2da87abc65dda442fc75a1612cc51e 100644 (file)
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -85,7 +85,7 @@ static struct gpio_chip template_chip = {
        .direction_output       = tps65912_gpio_output,
        .get                    = tps65912_gpio_get,
        .set                    = tps65912_gpio_set,
-       .can_sleep              = 1,
+       .can_sleep              = true,
        .ngpio                  = 5,
        .base                   = -1,
 };
@@ -93,7 +93,7 @@ static struct gpio_chip template_chip = {
 static int tps65912_gpio_probe(struct platform_device *pdev)
 {
        struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
-       struct tps65912_board *pdata = tps65912->dev->platform_data;
+       struct tps65912_board *pdata = dev_get_platdata(tps65912->dev);
        struct tps65912_gpio_data *tps65912_gpio;
        int ret;
 
@@ -123,13 +123,13 @@ static int tps65912_gpio_remove(struct platform_device *pdev)
 {
        struct tps65912_gpio_data  *tps65912_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&tps65912_gpio->gpio_chip);
+       gpiochip_remove(&tps65912_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver tps65912_gpio_driver = {
        .driver = {
                .name = "tps65912-gpio",
-               .owner = THIS_MODULE,
        },
        .probe = tps65912_gpio_probe,
        .remove = tps65912_gpio_remove,