Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a5bf60e..211a495 100644 (file)
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -117,7 +117,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
                host->pio_size = data->blocks * data->blksz;
                host->pio_ptr = sg_virt(data->sg);
                if (!nodma)
-                       printk(KERN_DEBUG "%s: fallback to PIO for data "
+                       pr_debug("%s: fallback to PIO for data "
                                          "at 0x%p size %d\n",
                                          mmc_hostname(host->mmc),
                                          host->pio_ptr, host->pio_size);
@@ -471,7 +471,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
                if (mrq->data)
                        err_status = mvsd_finish_data(host, mrq->data, err_status);
                if (err_status) {
-                       printk(KERN_ERR "%s: unhandled error status %#04x\n",
+                       pr_err("%s: unhandled error status %#04x\n",
                                        mmc_hostname(host->mmc), err_status);
                        cmd->error = -ENOMSG;
                }
@@ -489,7 +489,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
        if (irq_handled)
                return IRQ_HANDLED;
 
-       printk(KERN_ERR "%s: unhandled interrupt status=0x%04x en=0x%04x "
+       pr_err("%s: unhandled interrupt status=0x%04x en=0x%04x "
                        "pio=%d\n", mmc_hostname(host->mmc), intr_status,
                        host->intr_en, host->pio_size);
        return IRQ_NONE;
@@ -505,9 +505,9 @@ static void mvsd_timeout_timer(unsigned long data)
        spin_lock_irqsave(&host->lock, flags);
        mrq = host->mrq;
        if (mrq) {
-               printk(KERN_ERR "%s: Timeout waiting for hardware interrupt.\n",
+               pr_err("%s: Timeout waiting for hardware interrupt.\n",
                                mmc_hostname(host->mmc));
-               printk(KERN_ERR "%s: hw_state=0x%04x, intr_status=0x%04x "
+               pr_err("%s: hw_state=0x%04x, intr_status=0x%04x "
                                "intr_en=0x%04x\n", mmc_hostname(host->mmc),
                                mvsd_read(MVSD_HW_STATE),
                                mvsd_read(MVSD_NOR_INTR_STATUS),
@@ -762,7 +762,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
 
        ret = request_irq(irq, mvsd_irq, 0, DRIVER_NAME, host);
        if (ret) {
-               printk(KERN_ERR "%s: cannot assign irq %d\n", DRIVER_NAME, irq);
+               pr_err("%s: cannot assign irq %d\n", DRIVER_NAME, irq);
                goto out;
        } else
                host->irq = irq;
@@ -802,7 +802,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
        if (ret)
                goto out;
 
-       printk(KERN_NOTICE "%s: %s driver initialized, ",
+       pr_notice("%s: %s driver initialized, ",
                           mmc_hostname(mmc), DRIVER_NAME);
        if (host->gpio_card_detect)
                printk("using GPIO %d for card detection\n",