spi: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: dbrownell@users.sourceforge.net
Cc: spi-devel-general@lists.sourceforge.net
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index bab6ff061e91..60b5381c65c4 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -245,7 +245,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
 
 #ifdef  VERBOSE
                         pr_debug("%s: write-%d =%04x\n",
-                                        spi->dev.bus_id, bits, val);
+                                        dev_name(&spi->dev), bits, val);
 #endif
                         if (wait_uwire_csr_flag(CSRB, 0, 0))
                                 goto eio;
@@ -305,7 +305,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
                         status += bytes;
 #ifdef  VERBOSE
                         pr_debug("%s: read-%d =%04x\n",
-                                        spi->dev.bus_id, bits, val);
+                                        dev_name(&spi->dev), bits, val);
 #endif
 
                 }
@@ -331,7 +331,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
         uwire = spi_master_get_devdata(spi->master);
 
         if (spi->chip_select > 3) {
-                pr_debug("%s: cs%d?\n", spi->dev.bus_id, spi->chip_select);
+                pr_debug("%s: cs%d?\n", dev_name(&spi->dev), spi->chip_select);
                 status = -ENODEV;
                 goto done;
         }
@@ -343,7 +343,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
                 bits = 8;
 
         if (bits > 16) {
-                pr_debug("%s: wordsize %d?\n", spi->dev.bus_id, bits);
+                pr_debug("%s: wordsize %d?\n", dev_name(&spi->dev), bits);
                 status = -ENODEV;
                 goto done;
         }
@@ -378,7 +378,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
                 hz = t->speed_hz;
 
         if (!hz) {
-                pr_debug("%s: zero speed?\n", spi->dev.bus_id);
+                pr_debug("%s: zero speed?\n", dev_name(&spi->dev));
                 status = -EINVAL;
                 goto done;
         }
@@ -406,7 +406,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
         }
         if (div1_idx == 4) {
                 pr_debug("%s: lowest clock %ld, need %d\n",
-                        spi->dev.bus_id, rate / 10 / 8, hz);
+                        dev_name(&spi->dev), rate / 10 / 8, hz);
                 status = -EDOM;
                 goto done;
         }