1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 62e5a4d171e1..64acd9ce141c 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -194,7 +194,7 @@ static void wbsd_reset(struct wbsd_host *host)
 {
         u8 setup;
 
-        printk(KERN_ERR "%s: Resetting chip\n", mmc_hostname(host->mmc));
+        pr_err("%s: Resetting chip\n", mmc_hostname(host->mmc));
 
         /*
          * Soft reset of chip (SD/MMC part).
@@ -721,7 +721,7 @@ static void wbsd_finish_data(struct wbsd_host *host, struct mmc_data *data)
                  * Any leftover data?
                  */
                 if (count) {
-                        printk(KERN_ERR "%s: Incomplete DMA transfer. "
+                        pr_err("%s: Incomplete DMA transfer. "
                                 "%d bytes left.\n",
                                 mmc_hostname(host->mmc), count);
 
@@ -803,7 +803,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
                 default:
 #ifdef CONFIG_MMC_DEBUG
-                        printk(KERN_WARNING "%s: Data command %d is not "
+                        pr_warning("%s: Data command %d is not "
                                 "supported by this controller.\n",
                                 mmc_hostname(host->mmc), cmd->opcode);
 #endif
@@ -1029,7 +1029,7 @@ static void wbsd_tasklet_card(unsigned long param)
                 host->flags &= ~WBSD_FCARD_PRESENT;
 
                 if (host->mrq) {
-                        printk(KERN_ERR "%s: Card removed during transfer!\n",
+                        pr_err("%s: Card removed during transfer!\n",
                                 mmc_hostname(host->mmc));
                         wbsd_reset(host);
 
@@ -1429,7 +1429,7 @@ free:
         free_dma(dma);
 
 err:
-        printk(KERN_WARNING DRIVER_NAME ": Unable to allocate DMA %d. "
+        pr_warning(DRIVER_NAME ": Unable to allocate DMA %d. "
                 "Falling back on FIFO.\n", dma);
 }
 
@@ -1664,7 +1664,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
         ret = wbsd_scan(host);
         if (ret) {
                 if (pnp && (ret == -ENODEV)) {
-                        printk(KERN_WARNING DRIVER_NAME
+                        pr_warning(DRIVER_NAME
                                 ": Unable to confirm device presence. You may "
                                 "experience lock-ups.\n");
                 } else {
@@ -1688,7 +1688,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
          */
         if (pnp) {
                 if ((host->config != 0) && !wbsd_chip_validate(host)) {
-                        printk(KERN_WARNING DRIVER_NAME
+                        pr_warning(DRIVER_NAME
                                 ": PnP active but chip not configured! "
                                 "You probably have a buggy BIOS. "
                                 "Configuring chip manually.\n");
@@ -1720,7 +1720,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
 
         mmc_add_host(mmc);
 
-        printk(KERN_INFO "%s: W83L51xD", mmc_hostname(mmc));
+        pr_info("%s: W83L51xD", mmc_hostname(mmc));
         if (host->chip_id != 0)
                 printk(" id %x", (int)host->chip_id);
         printk(" at 0x%x irq %d", (int)host->base, (int)host->irq);
@@ -1909,7 +1909,7 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
          */
         if (host->config != 0) {
                 if (!wbsd_chip_validate(host)) {
-                        printk(KERN_WARNING DRIVER_NAME
+                        pr_warning(DRIVER_NAME
                                 ": PnP active but chip not configured! "
                                 "You probably have a buggy BIOS. "
                                 "Configuring chip manually.\n");
@@ -1973,9 +1973,9 @@ static int __init wbsd_drv_init(void)
 {
         int result;
 
-        printk(KERN_INFO DRIVER_NAME
+        pr_info(DRIVER_NAME
                 ": Winbond W83L51xD SD/MMC card interface driver\n");
-        printk(KERN_INFO DRIVER_NAME ": Copyright(c) Pierre Ossman\n");
+        pr_info(DRIVER_NAME ": Copyright(c) Pierre Ossman\n");
 
 #ifdef CONFIG_PNP