gpio: use dev_get_platdata()

Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

31 files changed, 45 insertions, 42 deletions

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index 721607904d0a..5d518d5db7a0 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -129,7 +129,7 @@ static int gen_74x164_probe(struct spi_device *spi)
         if (!chip)
                 return -ENOMEM;
 
-        pdata = spi->dev.platform_data;
+        pdata = dev_get_platdata(&spi->dev);
         if (pdata && pdata->base)
                 chip->gpio_chip.base = pdata->base;
         else
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index f33f78dcadaa..084337d5514d 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -89,7 +89,7 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip,
 
 static int adp5520_gpio_probe(struct platform_device *pdev)
 {
-        struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;
+        struct adp5520_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct adp5520_gpio *dev;
         struct gpio_chip *gc;
         int ret, i, gpios;
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index 2ba56987db04..90fc4c99c024 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -276,7 +276,8 @@ static irqreturn_t adp5588_irq_handler(int irq, void *devid)
 static int adp5588_irq_setup(struct adp5588_gpio *dev)
 {
         struct i2c_client *client = dev->client;
-        struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
+        struct adp5588_gpio_platform_data *pdata =
+                        dev_get_platdata(&client->dev);
         unsigned gpio;
         int ret;
 
@@ -349,7 +350,8 @@ static void adp5588_irq_teardown(struct adp5588_gpio *dev)
 static int adp5588_gpio_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
-        struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
+        struct adp5588_gpio_platform_data *pdata =
+                        dev_get_platdata(&client->dev);
         struct adp5588_gpio *dev;
         struct gpio_chip *gc;
         int ret, i, revid;
@@ -440,7 +442,8 @@ err:
 
 static int adp5588_gpio_remove(struct i2c_client *client)
 {
-        struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
+        struct adp5588_gpio_platform_data *pdata =
+                        dev_get_platdata(&client->dev);
         struct adp5588_gpio *dev = i2c_get_clientdata(client);
         int ret;
 
diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index 0ea853f68db2..fa8b6a762761 100644
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -97,7 +97,7 @@ static struct gpio_chip template_chip = {
 static int arizona_gpio_probe(struct platform_device *pdev)
 {
         struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
-        struct arizona_pdata *pdata = arizona->dev->platform_data;
+        struct arizona_pdata *pdata = dev_get_platdata(arizona->dev);
         struct arizona_gpio *arizona_gpio;
         int ret;
 
diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 29b11e9b6a78..9b77dc05d4ad 100644
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -216,7 +216,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         gpio->da9052 = dev_get_drvdata(pdev->dev.parent);
-        pdata = gpio->da9052->dev->platform_data;
+        pdata = dev_get_platdata(gpio->da9052->dev);
 
         gpio->gp = reference_gp;
         if (pdata && pdata->gpio_base)
diff --git a/drivers/gpio/gpio-da9055.c b/drivers/gpio/gpio-da9055.c
index fd6dfe382f13..7ef0820032bd 100644
--- a/drivers/gpio/gpio-da9055.c
+++ b/drivers/gpio/gpio-da9055.c
@@ -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)
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index eca119b58c21..c6e1f086efe8 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -253,7 +253,7 @@ static struct irq_domain_ops em_gio_irq_domain_ops = {
 static int em_gio_probe(struct platform_device *pdev)
 {
         struct gpio_em_config pdata_dt;
-        struct gpio_em_config *pdata = pdev->dev.platform_data;
+        struct gpio_em_config *pdata = dev_get_platdata(&pdev->dev);
         struct em_gio_priv *p;
         struct resource *io[2], *irq[2];
         struct gpio_chip *gpio_chip;
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index 2729e3d2d5bb..814addb62d2c 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -354,7 +354,7 @@ static int ichx_gpio_probe(struct platform_device *pdev)
 {
         struct resource *res_base, *res_pm;
         int err;
-        struct lpc_ich_info *ich_info = pdev->dev.platform_data;
+        struct lpc_ich_info *ich_info = dev_get_platdata(&pdev->dev);
 
         if (!ich_info)
                 return -ENODEV;
diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 7d0a04169a35..2ecd3a09c743 100644
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -149,7 +149,7 @@ static int ttl_probe(struct platform_device *pdev)
         struct resource *res;
         int ret;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_err(dev, "no platform data\n");
                 ret = -ENXIO;
diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c
index 1bdc3a2e40dc..3f5b20038af1 100644
--- a/drivers/gpio/gpio-kempld.c
+++ b/drivers/gpio/gpio-kempld.c
@@ -150,7 +150,7 @@ static int kempld_gpio_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct kempld_device_data *pld = dev_get_drvdata(dev->parent);
-        struct kempld_platform_data *pdata = pld->dev->platform_data;
+        struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
         struct kempld_gpio_data *gpio;
         struct gpio_chip *chip;
         int ret;
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index 00092342b84c..f4f4ed19bdc1 100644
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -166,7 +166,7 @@ int __max730x_probe(struct max7301 *ts)
         struct max7301_platform_data *pdata;
         int i, ret;
 
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
 
         mutex_init(&ts->lock);
         dev_set_drvdata(dev, ts);
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index d4b51b163b03..91ad74dea8ce 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -453,7 +453,7 @@ static int max732x_irq_setup(struct max732x_chip *chip,
                              const struct i2c_device_id *id)
 {
         struct i2c_client *client = chip->client;
-        struct max732x_platform_data *pdata = client->dev.platform_data;
+        struct max732x_platform_data *pdata = dev_get_platdata(&client->dev);
         int has_irq = max732x_features[id->driver_data] >> 32;
         int ret;
 
@@ -512,7 +512,7 @@ static int max732x_irq_setup(struct max732x_chip *chip,
                              const struct i2c_device_id *id)
 {
         struct i2c_client *client = chip->client;
-        struct max732x_platform_data *pdata = client->dev.platform_data;
+        struct max732x_platform_data *pdata = dev_get_platdata(&client->dev);
         int has_irq = max732x_features[id->driver_data] >> 32;
 
         if (pdata->irq_base && has_irq != INT_NONE)
@@ -583,7 +583,7 @@ static int max732x_probe(struct i2c_client *client,
         uint16_t addr_a, addr_b;
         int ret, nr_port;
 
-        pdata = client->dev.platform_data;
+        pdata = dev_get_platdata(&client->dev);
         if (pdata == NULL) {
                 dev_dbg(&client->dev, "no platform data\n");
                 return -EINVAL;
@@ -653,7 +653,7 @@ out_failed:
 
 static int max732x_remove(struct i2c_client *client)
 {
-        struct max732x_platform_data *pdata = client->dev.platform_data;
+        struct max732x_platform_data *pdata = dev_get_platdata(&client->dev);
         struct max732x_chip *chip = i2c_get_clientdata(client);
         int ret;
 
diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index 63a7a1bfb2d9..3fd2caa4a2e0 100644
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -86,7 +86,7 @@ static int mc33880_probe(struct spi_device *spi)
         struct mc33880_platform_data *pdata;
         int ret;
 
-        pdata = spi->dev.platform_data;
+        pdata = dev_get_platdata(&spi->dev);
         if (!pdata || !pdata->base) {
                 dev_dbg(&spi->dev, "incorrect or missing platform data\n");
                 return -EINVAL;
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 87ed6bf6528b..d96bf8a76f5c 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -520,7 +520,7 @@ static int mcp230xx_probe(struct i2c_client *client,
 
         match = of_match_device(of_match_ptr(mcp23s08_i2c_of_match),
                                         &client->dev);
-        pdata = client->dev.platform_data;
+        pdata = dev_get_platdata(&client->dev);
         if (match || !pdata) {
                 base = -1;
                 pullups = 0;
@@ -634,7 +634,7 @@ static int mcp23s08_probe(struct spi_device *spi)
                         pullups[addr] = 0;
         } else {
                 type = spi_get_device_id(spi)->driver_data;
-                pdata = spi->dev.platform_data;
+                pdata = dev_get_platdata(&spi->dev);
                 if (!pdata || !gpio_is_valid(pdata->base)) {
                         dev_dbg(&spi->dev,
                                         "invalid or missing platform data\n");
diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c
index 27ea7b9257ff..d75eaa3a1dcc 100644
--- a/drivers/gpio/gpio-msic.c
+++ b/drivers/gpio/gpio-msic.c
@@ -259,7 +259,7 @@ static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 static int platform_msic_gpio_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
-        struct intel_msic_gpio_pdata *pdata = dev->platform_data;
+        struct intel_msic_gpio_pdata *pdata = dev_get_platdata(dev);
         struct msic_gpio *mg;
         int irq = platform_get_irq(pdev, 0);
         int retval;
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index dfeb3a3a8f20..867efe57b038 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1100,7 +1100,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
 
         match = of_match_device(of_match_ptr(omap_gpio_match), dev);
 
-        pdata = match ? match->data : dev->platform_data;
+        pdata = match ? match->data : dev_get_platdata(dev);
         if (!pdata)
                 return -EINVAL;
 
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 426c51dd420c..07651d30ba8b 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -731,7 +731,7 @@ static int pca953x_probe(struct i2c_client *client,
         if (chip == NULL)
                 return -ENOMEM;
 
-        pdata = client->dev.platform_data;
+        pdata = dev_get_platdata(&client->dev);
         if (pdata) {
                 irq_base = pdata->irq_base;
                 chip->gpio_start = pdata->gpio_base;
@@ -785,7 +785,7 @@ static int pca953x_probe(struct i2c_client *client,
 
 static int pca953x_remove(struct i2c_client *client)
 {
-        struct pca953x_platform_data *pdata = client->dev.platform_data;
+        struct pca953x_platform_data *pdata = dev_get_platdata(&client->dev);
         struct pca953x_chip *chip = i2c_get_clientdata(client);
         int ret = 0;
 
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index e8faf53f3875..e8835d64e921 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -262,7 +262,7 @@ static int pcf857x_probe(struct i2c_client *client,
         struct pcf857x                  *gpio;
         int                             status;
 
-        pdata = client->dev.platform_data;
+        pdata = dev_get_platdata(&client->dev);
         if (!pdata) {
                 dev_dbg(&client->dev, "no platform data\n");
         }
@@ -396,7 +396,7 @@ fail:
 
 static int pcf857x_remove(struct i2c_client *client)
 {
-        struct pcf857x_platform_data    *pdata = client->dev.platform_data;
+        struct pcf857x_platform_data    *pdata = dev_get_platdata(&client->dev);
         struct pcf857x                  *gpio = i2c_get_clientdata(client);
         int                             status = 0;
 
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 6a4bd0dae0ce..4274e2e70ef8 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -259,7 +259,7 @@ static const struct irq_domain_ops pl061_domain_ops = {
 static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
 {
         struct device *dev = &adev->dev;
-        struct pl061_platform_data *pdata = dev->platform_data;
+        struct pl061_platform_data *pdata = dev_get_platdata(dev);
         struct pl061_gpio *chip;
         int ret, irq, i, irq_base;
 
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index e8198dd68615..e3745eb07570 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -285,7 +285,7 @@ static struct irq_domain_ops gpio_rcar_irq_domain_ops = {
 
 static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
 {
-        struct gpio_rcar_config *pdata = p->pdev->dev.platform_data;
+        struct gpio_rcar_config *pdata = dev_get_platdata(&p->pdev->dev);
         struct device_node *np = p->pdev->dev.of_node;
         struct of_phandle_args args;
         int ret;
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 368c3c00fca5..88577c3272a5 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -135,7 +135,7 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
         struct rdc321x_gpio *rdc321x_gpio_dev;
         struct rdc321x_gpio_pdata *pdata;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 return -ENODEV;
diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index f43ab6aea281..f2fb12c18da9 100644
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -361,7 +361,7 @@ static int gsta_probe(struct platform_device *dev)
         struct gsta_gpio *chip;
         struct resource *res;
 
-        pdev = *(struct pci_dev **)(dev->dev.platform_data);
+        pdev = *(struct pci_dev **)dev_get_platdata(&dev->dev);
         gpio_pdata = dev_get_platdata(&pdev->dev);
 
         if (gpio_pdata == NULL)
diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index f371732591d2..d2983e9ad6af 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -583,7 +583,7 @@ static int sx150x_probe(struct i2c_client *client,
         struct sx150x_chip *chip;
         int rc;
 
-        pdata = client->dev.platform_data;
+        pdata = dev_get_platdata(&client->dev);
         if (!pdata)
                 return -EINVAL;
 
diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 4c65f8883204..7a0e956ef1ed 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -227,7 +227,7 @@ static int timbgpio_probe(struct platform_device *pdev)
         struct gpio_chip *gc;
         struct timbgpio *tgpio;
         struct resource *iomem;
-        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
         int irq = platform_get_irq(pdev, 0);
 
         if (!pdata || pdata->nr_pins > 32) {
@@ -318,7 +318,7 @@ err_mem:
 static int timbgpio_remove(struct platform_device *pdev)
 {
         int err;
-        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct timbgpio *tgpio = platform_get_drvdata(pdev);
         struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         int irq = platform_get_irq(pdev, 0);
diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index 30a5844a7dca..276a4229b032 100644
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -87,7 +87,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;
 
diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c
index cc53cab8df2a..3df3ebdb3e52 100644
--- a/drivers/gpio/gpio-ts5500.c
+++ b/drivers/gpio/gpio-ts5500.c
@@ -322,7 +322,7 @@ static void ts5500_disable_irq(struct ts5500_priv *priv)
 static int ts5500_dio_probe(struct platform_device *pdev)
 {
         enum ts5500_blocks block = platform_get_device_id(pdev)->driver_data;
-        struct ts5500_dio_platform_data *pdata = pdev->dev.platform_data;
+        struct ts5500_dio_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct device *dev = &pdev->dev;
         const char *name = dev_name(dev);
         struct ts5500_priv *priv;
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)
                 /* optionally have the first two GPIOs switch vMMC1
                  * and vMMC2 power supplies based on card presence.
                  */
-                pdata = chip->dev->platform_data;
+                pdata = dev_get_platdata(chip->dev);
                 if (pdata)
                         value |= pdata->mmc_cd & 0x03;
 
@@ -460,7 +460,7 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev)
 
 static int gpio_twl4030_probe(struct platform_device *pdev)
 {
-        struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
+        struct twl4030_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct device_node *node = pdev->dev.of_node;
         struct gpio_twl4030_priv *priv;
         int ret, irq_base;
@@ -556,7 +556,7 @@ out:
 /* Cannot use as gpio_twl4030_probe() calls us */
 static int gpio_twl4030_remove(struct platform_device *pdev)
 {
-        struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
+        struct twl4030_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct gpio_twl4030_priv *priv = platform_get_drvdata(pdev);
         int status;
 
diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c
index 6d0feb234d3c..1a605f2a0f55 100644
--- a/drivers/gpio/gpio-ucb1400.c
+++ b/drivers/gpio/gpio-ucb1400.c
@@ -45,7 +45,7 @@ static void ucb1400_gpio_set(struct gpio_chip *gc, unsigned off, int val)
 
 static int ucb1400_gpio_probe(struct platform_device *dev)
 {
-        struct ucb1400_gpio *ucb = dev->dev.platform_data;
+        struct ucb1400_gpio *ucb = dev_get_platdata(&dev->dev);
         int err = 0;
 
         if (!(ucb && ucb->gpio_offset)) {
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index 2a743e10ecb6..456000c5c457 100644
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -246,7 +246,7 @@ static struct gpio_chip template_chip = {
 static int wm831x_gpio_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
-        struct wm831x_pdata *pdata = wm831x->dev->platform_data;
+        struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
         struct wm831x_gpio *wm831x_gpio;
         int ret;
 
diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index 0b598cf3df9d..fc49154be7b1 100644
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -112,7 +112,7 @@ static struct gpio_chip template_chip = {
 static int wm8350_gpio_probe(struct platform_device *pdev)
 {
         struct wm8350 *wm8350 = dev_get_drvdata(pdev->dev.parent);
-        struct wm8350_platform_data *pdata = wm8350->dev->platform_data;
+        struct wm8350_platform_data *pdata = dev_get_platdata(wm8350->dev);
         struct wm8350_gpio_data *wm8350_gpio;
         int ret;
 
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index ae409fd94af7..a53dbdefc7ee 100644
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -248,7 +248,7 @@ static struct gpio_chip template_chip = {
 static int wm8994_gpio_probe(struct platform_device *pdev)
 {
         struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);
-        struct wm8994_pdata *pdata = wm8994->dev->platform_data;
+        struct wm8994_pdata *pdata = dev_get_platdata(wm8994->dev);
         struct wm8994_gpio *wm8994_gpio;
         int ret;