mmc: mvsdio: use dev_*() API instead of pr_*() API

The mvsdio driver was already using some dev_*() functions to print
some messages, but still using pr_*() functions for some others. This
patch converts all messages to use dev_*() functions.

Many of the pr_*() function calls were printing the output of
mmc_hostname() to preprend the message with an identifier for the
device. Since the dev_*() functions do that automatically, this patch
also gets rid of those string prefixes.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index ae08b32170f20ba757c0a08835e34f4ba5f32583..8960fc846c772c36b5d9bed5ecd06845cad551dd 100644 (file)
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -119,10 +119,8 @@ 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)
-                       pr_debug("%s: fallback to PIO for data "
-                                         "at 0x%p size %d\n",
-                                         mmc_hostname(host->mmc),
-                                         host->pio_ptr, host->pio_size);
+                       dev_dbg(host->dev, "fallback to PIO for data at 0x%p size %d\n",
+                               host->pio_ptr, host->pio_size);
                return 1;
        } else {
                dma_addr_t phys_addr;
@@ -473,8 +471,8 @@ 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) {
-                       pr_err("%s: unhandled error status %#04x\n",
-                                       mmc_hostname(host->mmc), err_status);
+                       dev_err(host->dev, "unhandled error status %#04x\n",
+                               err_status);
                        cmd->error = -ENOMSG;
                }
 
@@ -491,9 +489,8 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
        if (irq_handled)
                return IRQ_HANDLED;
 
-       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);
+       dev_err(host->dev, "unhandled interrupt status=0x%04x en=0x%04x pio=%d\n",
+               intr_status, host->intr_en, host->pio_size);
        return IRQ_NONE;
 }
 
@@ -507,13 +504,11 @@ static void mvsd_timeout_timer(unsigned long data)
        spin_lock_irqsave(&host->lock, flags);
        mrq = host->mrq;
        if (mrq) {
-               pr_err("%s: Timeout waiting for hardware interrupt.\n",
-                               mmc_hostname(host->mmc));
-               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),
-                               mvsd_read(MVSD_NOR_INTR_EN));
+               dev_err(host->dev, "Timeout waiting for hardware interrupt.\n");
+               dev_err(host->dev, "hw_state=0x%04x, intr_status=0x%04x intr_en=0x%04x\n",
+                       mvsd_read(MVSD_HW_STATE),
+                       mvsd_read(MVSD_NOR_INTR_STATUS),
+                       mvsd_read(MVSD_NOR_INTR_EN));
 
                host->mrq = NULL;
 
@@ -778,7 +773,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
 
        ret = devm_request_irq(&pdev->dev, irq, mvsd_irq, 0, DRIVER_NAME, host);
        if (ret) {
-               pr_err("%s: cannot assign irq %d\n", DRIVER_NAME, irq);
+               dev_err(&pdev->dev, "cannot assign irq %d\n", irq);
                goto out;
        }
 
@@ -797,13 +792,11 @@ static int __init mvsd_probe(struct platform_device *pdev)
        if (ret)
                goto out;
 
-       pr_notice("%s: %s driver initialized, ",
-                          mmc_hostname(mmc), DRIVER_NAME);
        if (!(mmc->caps & MMC_CAP_NEEDS_POLL))
-               printk("using GPIO %d for card detection\n",
-                      gpio_card_detect);
+               dev_notice(&pdev->dev, "using GPIO %d for card detection\n",
+                          gpio_card_detect);
        else
-               printk("lacking card detect (fall back to polling)\n");
+               dev_notice(&pdev->dev, "lacking card detect (fall back to polling)\n");
        return 0;
 
 out: