[MMC] Use controller id instead of driver name for printks

The printks that aren't for debugging should use the name of the controller,
not the driver name. Multiple MMC controllers aren't that common today, but
this is the right way to do things.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index ea0c4b3..4ff67e7 100644 (file)
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -201,7 +201,7 @@ static void wbsd_reset(struct wbsd_host* host)
 {
        u8 setup;
 
-       printk(KERN_ERR DRIVER_NAME ": Resetting chip\n");
+       printk(KERN_ERR "%s: Resetting chip\n", mmc_hostname(host->mmc));
 
        /*
         * Soft reset of chip (SD/MMC part).
@@ -880,8 +880,9 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
                 */
                if (count)
                {
-                       printk(KERN_ERR DRIVER_NAME ": Incomplete DMA "
-                               "transfer. %d bytes left.\n", count);
+                       printk(KERN_ERR "%s: Incomplete DMA transfer. "
+                               "%d bytes left.\n",
+                               mmc_hostname(host->mmc), count);
 
                        data->error = MMC_ERR_FAILED;
                }
@@ -1169,8 +1170,8 @@ static void wbsd_tasklet_card(unsigned long param)
 
                if (host->mrq)
                {
-                       printk(KERN_ERR DRIVER_NAME
-                               ": Card removed during transfer!\n");
+                       printk(KERN_ERR "%s: Card removed during transfer!\n",
+                               mmc_hostname(host->mmc));
                        wbsd_reset(host);
 
                        host->mrq->cmd->error = MMC_ERR_FAILED;