1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 1e88e8d66c55..ea6d45d1dcd6 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1053,16 +1053,13 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *of_id =
                         of_match_device(i2c_pxa_dt_ids, &pdev->dev);
-        int ret;
 
         if (!of_id)
                 return 1;
-        ret = of_alias_get_id(np, "i2c");
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
-                return ret;
-        }
-        pdev->id = ret;
+
+        /* For device tree we always use the dynamic or alias-assigned ID */
+        i2c->adap.nr = -1;
+
         if (of_get_property(np, "mrvl,i2c-polling", NULL))
                 i2c->use_pio = 1;
         if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
@@ -1100,6 +1097,9 @@ static int i2c_pxa_probe(struct platform_device *dev)
                 goto emalloc;
         }
 
+        /* Default adapter num to device id; i2c_pxa_probe_dt can override. */
+        i2c->adap.nr = dev->id;
+
         ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type);
         if (ret > 0)
                 ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
@@ -1124,9 +1124,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
         spin_lock_init(&i2c->lock);
         init_waitqueue_head(&i2c->wait);
 
-        i2c->adap.nr = dev->id;
-        snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u",
-                 i2c->adap.nr);
+        strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name));
 
         i2c->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(i2c->clk)) {
@@ -1169,7 +1167,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
         } else {
                 i2c->adap.algo = &i2c_pxa_algorithm;
                 ret = request_irq(irq, i2c_pxa_handler, IRQF_SHARED,
-                                  i2c->adap.name, i2c);
+                                  dev_name(&dev->dev), i2c);
                 if (ret)
                         goto ereqirq;
         }