diff options
Diffstat (limited to 'drivers/gpio/gpio-twl4030.c')
-rw-r--r-- | drivers/gpio/gpio-twl4030.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c index 4d330e36da1d..d8e4f6efcb29 100644 --- a/drivers/gpio/gpio-twl4030.c +++ b/drivers/gpio/gpio-twl4030.c | |||
@@ -256,7 +256,7 @@ static int twl_request(struct gpio_chip *chip, unsigned offset) | |||
256 | /* optionally have the first two GPIOs switch vMMC1 | 256 | /* optionally have the first two GPIOs switch vMMC1 |
257 | * and vMMC2 power supplies based on card presence. | 257 | * and vMMC2 power supplies based on card presence. |
258 | */ | 258 | */ |
259 | pdata = chip->dev->platform_data; | 259 | pdata = dev_get_platdata(chip->dev); |
260 | if (pdata) | 260 | if (pdata) |
261 | value |= pdata->mmc_cd & 0x03; | 261 | value |= pdata->mmc_cd & 0x03; |
262 | 262 | ||
@@ -460,7 +460,7 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev) | |||
460 | 460 | ||
461 | static int gpio_twl4030_probe(struct platform_device *pdev) | 461 | static int gpio_twl4030_probe(struct platform_device *pdev) |
462 | { | 462 | { |
463 | struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; | 463 | struct twl4030_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev); |
464 | struct device_node *node = pdev->dev.of_node; | 464 | struct device_node *node = pdev->dev.of_node; |
465 | struct gpio_twl4030_priv *priv; | 465 | struct gpio_twl4030_priv *priv; |
466 | int ret, irq_base; | 466 | int ret, irq_base; |
@@ -556,7 +556,7 @@ out: | |||
556 | /* Cannot use as gpio_twl4030_probe() calls us */ | 556 | /* Cannot use as gpio_twl4030_probe() calls us */ |
557 | static int gpio_twl4030_remove(struct platform_device *pdev) | 557 | static int gpio_twl4030_remove(struct platform_device *pdev) |
558 | { | 558 | { |
559 | struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; | 559 | struct twl4030_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev); |
560 | struct gpio_twl4030_priv *priv = platform_get_drvdata(pdev); | 560 | struct gpio_twl4030_priv *priv = platform_get_drvdata(pdev); |
561 | int status; | 561 | int status; |
562 | 562 | ||