Merge tag 'iio-fixes-for-4.20a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / i2c / busses / i2c-powermac.c

diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index f2a2067525efb1c3c1bb9b317ba136586b03aed9..f6f4ed8afc9386ac34fe7be9ee40e575ac6e00ee 100644 (file)
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -388,9 +388,8 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap,
 static int i2c_powermac_probe(struct platform_device *dev)
 {
        struct pmac_i2c_bus *bus = dev_get_platdata(&dev->dev);
-       struct device_node *parent = NULL;
+       struct device_node *parent;
        struct i2c_adapter *adapter;
-       const char *basename;
        int rc;
 
        if (bus == NULL)
@@ -407,23 +406,25 @@ static int i2c_powermac_probe(struct platform_device *dev)
                parent = of_get_parent(pmac_i2c_get_controller(bus));
                if (parent == NULL)
                        return -EINVAL;
-               basename = parent->name;
+               snprintf(adapter->name, sizeof(adapter->name), "%pOFn %d",
+                        parent,
+                        pmac_i2c_get_channel(bus));
+               of_node_put(parent);
                break;
        case pmac_i2c_bus_pmu:
-               basename = "pmu";
+               snprintf(adapter->name, sizeof(adapter->name), "pmu %d",
+                        pmac_i2c_get_channel(bus));
                break;
        case pmac_i2c_bus_smu:
                /* This is not what we used to do but I'm fixing drivers at
                 * the same time as this change
                 */
-               basename = "smu";
+               snprintf(adapter->name, sizeof(adapter->name), "smu %d",
+                        pmac_i2c_get_channel(bus));
                break;
        default:
                return -EINVAL;
        }
-       snprintf(adapter->name, sizeof(adapter->name), "%s %d", basename,
-                pmac_i2c_get_channel(bus));
-       of_node_put(parent);
 
        platform_set_drvdata(dev, adapter);
        adapter->algo = &i2c_powermac_algorithm;