1 files changed, 17 insertions, 4 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index f74af33f5ddc..bc9a294c07f7 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -618,6 +618,22 @@ void i2c_unlock_adapter(struct i2c_adapter *adapter)
 }
 EXPORT_SYMBOL_GPL(i2c_unlock_adapter);
 
+static void i2c_dev_set_name(struct i2c_adapter *adap,
+                             struct i2c_client *client)
+{
+        struct acpi_device *adev = ACPI_COMPANION(&client->dev);
+
+        if (adev) {
+                dev_set_name(&client->dev, "i2c-%s", acpi_dev_name(adev));
+                return;
+        }
+
+        /* For 10-bit clients, add an arbitrary offset to avoid collisions */
+        dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
+                     client->addr | ((client->flags & I2C_CLIENT_TEN)
+                                     ? 0xa000 : 0));
+}
+
 /**
  * i2c_new_device - instantiate an i2c device
  * @adap: the adapter managing the device
@@ -676,10 +692,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
         client->dev.of_node = info->of_node;
         ACPI_COMPANION_SET(&client->dev, info->acpi_node.companion);
 
-        /* For 10-bit clients, add an arbitrary offset to avoid collisions */
-        dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
-                     client->addr | ((client->flags & I2C_CLIENT_TEN)
-                                     ? 0xa000 : 0));
+        i2c_dev_set_name(adap, client);
         status = device_register(&client->dev);
         if (status)
                 goto out_err;