2005-11-01 12:07:38

by Pierre Ossman

Subject: [PATCH] [MMC] Use controller id instead of driver name for printks

The printks that aren't for debugging should use the name of the controller,
not the driver name. Multiple MMC controllers aren't that common today, but
this is the right way to do things.

Signed-off-by: Pierre Ossman <[email protected]>
---

drivers/mmc/wbsd.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -201,7 +201,7 @@ static void wbsd_reset(struct wbsd_host*
{
u8 setup;

- printk(KERN_ERR DRIVER_NAME ": Resetting chip\n");
+ printk(KERN_ERR "%s: Resetting chip\n", mmc_hostname(host->mmc));

/*
* Soft reset of chip (SD/MMC part).
@@ -880,8 +880,9 @@ static void wbsd_finish_data(struct wbsd
*/
if (count)
{
- printk(KERN_ERR DRIVER_NAME ": Incomplete DMA "
- "transfer. %d bytes left.\n", count);
+ printk(KERN_ERR "%s: Incomplete DMA transfer. "
+ "%d bytes left.\n",
+ mmc_hostname(host->mmc), count);

data->error = MMC_ERR_FAILED;
}
@@ -1169,8 +1170,8 @@ static void wbsd_tasklet_card(unsigned l

if (host->mrq)
{
- printk(KERN_ERR DRIVER_NAME
- ": Card removed during transfer!\n");
+ printk(KERN_ERR "%s: Card removed during transfer!\n",
+ mmc_hostname(host->mmc));
wbsd_reset(host);

host->mrq->cmd->error = MMC_ERR_FAILED;

2005-11-05 10:37:07

by Russell King

Subject: Re: [PATCH] [MMC] Use controller id instead of driver name for printks

On Tue, Nov 01, 2005 at 01:07:32PM +0100, Pierre Ossman wrote:
> The printks that aren't for debugging should use the name of the controller,
> not the driver name. Multiple MMC controllers aren't that common today, but
> this is the right way to do things.
>
> Signed-off-by: Pierre Ossman <[email protected]>

Applied, thanks.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core