[PATCH] [NAND] S3C2410 convert prinks to dev_*()s

[PATCH] [NAND] S3C2410 convert prinks to dev_*()s

[Ben Dooks]

Convert the use of printk() to the correct dev_info/dev_err
functions

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff -urpN -X ../dontdiff linux-2.6.17-git2/drivers/mtd/nand/s3c2410.c linux-2.6.17-git2-mtd1/drivers/mtd/nand/s3c2410.c
--- linux-2.6.17-git2/drivers/mtd/nand/s3c2410.c	2006-06-21 10:00:38.000000000 +0100
+++ linux-2.6.17-git2-mtd1/drivers/mtd/nand/s3c2410.c	2006-06-21 15:32:44.000000000 +0100
@@ -63,8 +63,6 @@
 #include <asm/arch/regs-nand.h>
 #include <asm/arch/nand.h>
 
-#define PFX "s3c2410-nand: "
-
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;
 #else
@@ -195,11 +193,11 @@ static int s3c2410_nand_inithw(struct s3
 	}
 
 	if (tacls < 0 || twrph0 < 0 || twrph1 < 0) {
-		printk(KERN_ERR PFX "cannot get timings suitable for board\n");
+		dev_err(info->device, "cannot get suitable timings\n");
 		return -EINVAL;
 	}
 
-	printk(KERN_INFO PFX "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
+	dev_info(info->device, "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
 	       tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate));
 
 	if (!info->is_s3c2440) {
@@ -218,7 +216,7 @@ static int s3c2410_nand_inithw(struct s3
 		       info->regs + S3C2440_NFCONT);
 	}
 
-	pr_debug(PFX "NF_CONF is 0x%lx\n", cfg);
+	dev_dbg(info->device, "NF_CONF is 0x%lx\n", cfg);
 
 	writel(cfg, info->regs + S3C2410_NFCONF);
 	return 0;
@@ -250,7 +248,7 @@ static void s3c2410_nand_select_chip(str
 		cur |= bit;
 	} else {
 		if (nmtd->set != NULL && chip > nmtd->set->nr_chips) {
-			printk(KERN_ERR PFX "chip %d out of range\n", chip);
+			dev_err(info->device, "invalid chip %d\n", chip);
 			return;
 		}
 

Re: [PATCH] [NAND] S3C2410 convert prinks to dev_*()s

[Thomas Gleixner]

On Wed, 2006-06-21 at 15:43 +0100, Ben Dooks wrote:
> Convert the use of printk() to the correct dev_info/dev_err
> functions
> 
> Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Thanks for the almost perfect patch :)

[PATCH] [MTD] NAND: S3C2410 convert prinks to dev_*()s

The mail filter sorts out the [PATCH] mails. My git-wrapper removes the
leading [PATCH] so I get the format which we used in CVS already:

[MTD] NAND: S3C2410 convert prinks to dev_*()s

Thanks,

	tglx

Re: [PATCH] [NAND] S3C2410 convert prinks to dev_*()s

[Josh Boyer]

On 6/21/06, Thomas Gleixner <tglx@linutronix.de> wrote:
> On Wed, 2006-06-21 at 15:43 +0100, Ben Dooks wrote:
> > Convert the use of printk() to the correct dev_info/dev_err
> > functions
> >
> > Signed-off-by: Ben Dooks <ben-linux@fluff.org>
>
> Thanks for the almost perfect patch :)
>
> [PATCH] [MTD] NAND: S3C2410 convert prinks to dev_*()s
>
> The mail filter sorts out the [PATCH] mails. My git-wrapper removes the
> leading [PATCH] so I get the format which we used in CVS already:

We should put that info on the website somewhere.  Most won't read it
anyway, but it's still worth put it there I think.

josh