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

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / tifm_sd.c

diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index 13844843e8de147a091f19166f1885df9e7262cb..82554ddec6b3cb6b3d3e0a438fdbc2bceeb3561e 100644 (file)
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -632,7 +632,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
        if (host->req) {
                printk(KERN_ERR "%s : unfinished request detected\n",
-                      sock->dev.bus_id);
+                      dev_name(&sock->dev));
                mrq->cmd->error = -ETIMEDOUT;
                goto err_out;
        }
@@ -672,7 +672,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                            ? PCI_DMA_TODEVICE
                                            : PCI_DMA_FROMDEVICE)) {
                                printk(KERN_ERR "%s : scatterlist map failed\n",
-                                      sock->dev.bus_id);
+                                      dev_name(&sock->dev));
                                mrq->cmd->error = -ENOMEM;
                                goto err_out;
                        }
@@ -684,7 +684,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                                   : PCI_DMA_FROMDEVICE);
                        if (host->sg_len < 1) {
                                printk(KERN_ERR "%s : scatterlist map failed\n",
-                                      sock->dev.bus_id);
+                                      dev_name(&sock->dev));
                                tifm_unmap_sg(sock, &host->bounce_buf, 1,
                                              r_data->flags & MMC_DATA_WRITE
                                              ? PCI_DMA_TODEVICE
@@ -748,7 +748,7 @@ static void tifm_sd_end_cmd(unsigned long data)
 
        if (!mrq) {
                printk(KERN_ERR " %s : no request to complete?\n",
-                      sock->dev.bus_id);
+                      dev_name(&sock->dev));
                spin_unlock_irqrestore(&sock->lock, flags);
                return;
        }
@@ -789,7 +789,7 @@ static void tifm_sd_abort(unsigned long data)
        printk(KERN_ERR
               "%s : card failed to respond for a long period of time "
               "(%x, %x)\n",
-              host->dev->dev.bus_id, host->req->cmd->opcode, host->cmd_flags);
+              dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags);
 
        tifm_eject(host->dev);
 }
@@ -906,7 +906,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
 
        if (rc) {
                printk(KERN_ERR "%s : controller failed to reset\n",
-                      sock->dev.bus_id);
+                      dev_name(&sock->dev));
                return -ENODEV;
        }
 
@@ -933,7 +933,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
        if (rc) {
                printk(KERN_ERR
                       "%s : card not ready - probe failed on initialization\n",
-                      sock->dev.bus_id);
+                      dev_name(&sock->dev));
                return -ENODEV;
        }
 
@@ -954,7 +954,7 @@ static int tifm_sd_probe(struct tifm_dev *sock)
        if (!(TIFM_SOCK_STATE_OCCUPIED
              & readl(sock->addr + SOCK_PRESENT_STATE))) {
                printk(KERN_WARNING "%s : card gone, unexpectedly\n",
-                      sock->dev.bus_id);
+                      dev_name(&sock->dev));
                return rc;
        }