1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index a968d8549ee5..8763d93ce2b7 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -357,6 +357,19 @@ struct spi_device *spi_alloc_device(struct spi_master *master)
 }
 EXPORT_SYMBOL_GPL(spi_alloc_device);
 
+static void spi_dev_set_name(struct spi_device *spi)
+{
+        struct acpi_device *adev = ACPI_COMPANION(&spi->dev);
+
+        if (adev) {
+                dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));
+                return;
+        }
+
+        dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
+                     spi->chip_select);
+}
+
 /**
  * spi_add_device - Add spi_device allocated with spi_alloc_device
  * @spi: spi_device to register
@@ -383,9 +396,7 @@ int spi_add_device(struct spi_device *spi)
         }
 
         /* Set the bus ID string */
-        dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
-                        spi->chip_select);
-
+        spi_dev_set_name(spi);
 
         /* We need to make sure there's no other device with this
          * chipselect **BEFORE** we call setup(), else we'll trash