1 files changed, 14 insertions, 16 deletions

diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c
index aa17f7580f61..6d4532702f80 100644
--- a/drivers/pinctrl/pinctrl-abx500.c
+++ b/drivers/pinctrl/pinctrl-abx500.c
@@ -851,23 +851,12 @@ static int abx500_gpio_probe(struct platform_device *pdev)
 
         if (abx500_pdata)
                 pdata = abx500_pdata->gpio;
-        if (!pdata) {
-                if (np) {
-                        const struct of_device_id *match;
 
-                        match = of_match_device(abx500_gpio_match, &pdev->dev);
-                        if (!match)
-                                return -ENODEV;
-                        id = (unsigned long)match->data;
-                } else {
-                        dev_err(&pdev->dev, "gpio dt and platform data missing\n");
-                        return -ENODEV;
-                }
+        if (!(pdata || np)) {
+                dev_err(&pdev->dev, "gpio dt and platform data missing\n");
+                return -ENODEV;
         }
 
-        if (platid)
-                id = platid->driver_data;
-
         pct = devm_kzalloc(&pdev->dev, sizeof(struct abx500_pinctrl),
                                    GFP_KERNEL);
         if (pct == NULL) {
@@ -882,6 +871,16 @@ static int abx500_gpio_probe(struct platform_device *pdev)
         pct->chip.dev = &pdev->dev;
         pct->chip.base = (np) ? -1 : pdata->gpio_base;
 
+        if (platid)
+                id = platid->driver_data;
+        else if (np) {
+                const struct of_device_id *match;
+
+                match = of_match_device(abx500_gpio_match, &pdev->dev);
+                if (match)
+                        id = (unsigned long)match->data;
+        }
+
         /* initialize the lock */
         mutex_init(&pct->lock);
 
@@ -900,8 +899,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
                 abx500_pinctrl_ab8505_init(&pct->soc);
                 break;
         default:
-                dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n",
-                                (int) platid->driver_data);
+                dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n", id);
                 mutex_destroy(&pct->lock);
                 return -EINVAL;
         }