mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 09:50:04 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Thomas Petazzoni 2013-03-22 14:37:21 +01:00 committed by Chris Ball
parent 5e81441e24
commit e573d6985e
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/mmc/host/mvsdio.c
View file

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