1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 56ff3e6864ea..12e443cc4ac9 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -322,7 +322,7 @@ static void atmel_spi_next_message(struct spi_master *master)
         spi = msg->spi;
 
         dev_dbg(master->dev.parent, "start message %p for %s\n",
-                        msg, spi->dev.bus_id);
+                        msg, dev_name(&spi->dev));
 
         /* select chip if it's not still active */
         if (as->stay) {
@@ -627,7 +627,7 @@ static int atmel_spi_setup(struct spi_device *spi)
                 if (!asd)
                         return -ENOMEM;
 
-                ret = gpio_request(npcs_pin, spi->dev.bus_id);
+                ret = gpio_request(npcs_pin, dev_name(&spi->dev));
                 if (ret) {
                         kfree(asd);
                         return ret;
@@ -668,7 +668,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
         as = spi_master_get_devdata(spi->master);
 
         dev_dbg(controller, "new message %p submitted for %s\n",
-                        msg, spi->dev.bus_id);
+                        msg, dev_name(&spi->dev));
 
         if (unlikely(list_empty(&msg->transfers)))
                 return -EINVAL;
@@ -803,7 +803,7 @@ static int __init atmel_spi_probe(struct platform_device *pdev)
         as->clk = clk;
 
         ret = request_irq(irq, atmel_spi_interrupt, 0,
-                        pdev->dev.bus_id, master);
+                        dev_name(&pdev->dev), master);
         if (ret)
                 goto out_unmap_regs;