Skip to contentSkip to conversation

S3C2410 convert prinks to dev_*()s

PATCH In review Ben Dooks 3 participants 3 messages Jun 21, 2006

Subsystems (3)
lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

PATCH 1/1 S3C2410 convert prinks to dev_*()s

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

drivers/mtd/nand/s3c2410.c +4 -6
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
@@ -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;
 		}
 
#1 lore raw
Quoted 4 lines · Ben Dooks

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

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

#2 lore raw
Quoted 4 lines · Thomas Gleixner
Quoted 3 lines · Ben Dooks

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

Quoted 8 lines
Quoted 1 line

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