Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / gpio / gpio-da9055.c

diff --git a/drivers/gpio/gpio-da9055.c b/drivers/gpio/gpio-da9055.c
index fd6dfe3..f992997 100644 (file)
--- a/drivers/gpio/gpio-da9055.c
+++ b/drivers/gpio/gpio-da9055.c
@@ -134,7 +134,7 @@ static struct gpio_chip reference_gp = {
        .direction_input = da9055_gpio_direction_input,
        .direction_output = da9055_gpio_direction_output,
        .to_irq = da9055_gpio_to_irq,
-       .can_sleep = 1,
+       .can_sleep = true,
        .ngpio = 3,
        .base = -1,
 };
@@ -150,7 +150,7 @@ static int da9055_gpio_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        gpio->da9055 = dev_get_drvdata(pdev->dev.parent);
-       pdata = gpio->da9055->dev->platform_data;
+       pdata = dev_get_platdata(gpio->da9055->dev);
 
        gpio->gp = reference_gp;
        if (pdata && pdata->gpio_base)