mmc: mvsdio: use dev_*() API instead of pr_*() API
Subsystems (2)
PATCH v2 1/1 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.
---
This is for 3.10.
Changes between v1 and v2:
* Fix incorrect format string. A "%s" was left, even though the mmc_hostname() argument was removed due to the conversion to the dev_*() API.
--- drivers/mmc/host/mvsdio.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/mmc/host/mvsdio.c +15 -22
@@ -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:
Signature · 1 line
1.7.9.5
PATCH v2 1/1 mmc: mvsdio: use dev_*() API instead of pr_*() API
Hi,
Quoted 10 lines · Thomas Petazzoni
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 <[email protected]>
Quoted 8 lines
---
This is for 3.10.Changes between v1 and v2:
* Fix incorrect format string. A "%s" was left, even though the
mmc_hostname()argument was removed due to the conversion to the dev_*() API.
Thanks, I've updated to v2 in mmc-next for 3.10.
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v2 1/1 mmc: mvsdio: use dev_*() API instead of pr_*() API
In reply to Thomas PetazzoniI've successfully compiled and tested this patch on my SheevaPlug platform.
- Ralph Droms
On Mar 22, 2013, at 9:37 AM, Thomas Petazzoni <[email protected]> wrote:
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.
---
This is for 3.10.
Changes between v1 and v2:
* Fix incorrect format string. A "%s" was left, even though the mmc_hostname() argument was removed due to the conversion to the dev_*() API.
---drivers/mmc/host/mvsdio.c | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
drivers/mmc/host/mvsdio.c +0 -0
@@ -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:
Signature · 1 line
1.7.9.5