Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[pandora-kernel.git] / drivers / mmc / host / au1xmmc.c

diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index 56e7834..5d3b9ae 100644 (file)
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -55,7 +55,7 @@
 
 #ifdef DEBUG
 #define DBG(fmt, idx, args...) \
-       printk(KERN_DEBUG "au1xmmc(%d): DEBUG: " fmt, idx, ##args)
+       pr_debug("au1xmmc(%d): DEBUG: " fmt, idx, ##args)
 #else
 #define DBG(fmt, idx, args...) do {} while (0)
 #endif
@@ -276,7 +276,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
                mmccmd |= SD_CMD_RT_3;
                break;
        default:
-               printk(KERN_INFO "au1xmmc: unhandled response type %02x\n",
+               pr_info("au1xmmc: unhandled response type %02x\n",
                        mmc_resp_type(cmd));
                return -EINVAL;
        }
@@ -1039,8 +1039,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
        if (has_dbdma()) {
                ret = au1xmmc_dbdma_init(host);
                if (ret)
-                       printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; "
-                                                    "using PIO\n");
+                       pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
        }
 
 #ifdef CONFIG_LEDS_CLASS
@@ -1065,7 +1064,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, host);
 
-       printk(KERN_INFO DRIVER_NAME ": MMC Controller %d set up at %8.8X"
+       pr_info(DRIVER_NAME ": MMC Controller %d set up at %8.8X"
                " (mode=%s)\n", pdev->id, host->iobase,
                host->flags & HOST_F_DMA ? "dma" : "pio");
 
@@ -1196,7 +1195,7 @@ static int __init au1xmmc_init(void)
                */
                memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
                if (!memid)
-                       printk(KERN_ERR "au1xmmc: cannot add memory dbdma\n");
+                       pr_err("au1xmmc: cannot add memory dbdma\n");
        }
        return platform_driver_register(&au1xmmc_driver);
 }