aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-06-21 10:43:05 -0400
committerThomas Gleixner <tglx@cruncher.tec.linutronix.de>2006-06-21 12:56:34 -0400
commit99974c62b6acd4093b6f485132067089c39f967c (patch)
treeac6f0125e576129735fbda03732104fd61f1c617
parent0d420f9d6111b3a2fb7d5dd0180456eed469055d (diff)
[MTD] NAND: S3C2410 convert prinks to dev_*()s
Convert the use of printk() to the correct dev_info/dev_err functions Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--drivers/mtd/nand/s3c2410.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 2c262fe03d8a..5219bd212cf6 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -63,8 +63,6 @@
63#include <asm/arch/regs-nand.h> 63#include <asm/arch/regs-nand.h>
64#include <asm/arch/nand.h> 64#include <asm/arch/nand.h>
65 65
66#define PFX "s3c2410-nand: "
67
68#ifdef CONFIG_MTD_NAND_S3C2410_HWECC 66#ifdef CONFIG_MTD_NAND_S3C2410_HWECC
69static int hardware_ecc = 1; 67static int hardware_ecc = 1;
70#else 68#else
@@ -195,11 +193,11 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info, struct platform_d
195 } 193 }
196 194
197 if (tacls < 0 || twrph0 < 0 || twrph1 < 0) { 195 if (tacls < 0 || twrph0 < 0 || twrph1 < 0) {
198 printk(KERN_ERR PFX "cannot get timings suitable for board\n"); 196 dev_err(info->device, "cannot get suitable timings\n");
199 return -EINVAL; 197 return -EINVAL;
200 } 198 }
201 199
202 printk(KERN_INFO PFX "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n", 200 dev_info(info->device, "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
203 tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate)); 201 tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate));
204 202
205 if (!info->is_s3c2440) { 203 if (!info->is_s3c2440) {
@@ -218,7 +216,7 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info, struct platform_d
218 info->regs + S3C2440_NFCONT); 216 info->regs + S3C2440_NFCONT);
219 } 217 }
220 218
221 pr_debug(PFX "NF_CONF is 0x%lx\n", cfg); 219 dev_dbg(info->device, "NF_CONF is 0x%lx\n", cfg);
222 220
223 writel(cfg, info->regs + S3C2410_NFCONF); 221 writel(cfg, info->regs + S3C2410_NFCONF);
224 return 0; 222 return 0;
@@ -250,7 +248,7 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
250 cur |= bit; 248 cur |= bit;
251 } else { 249 } else {
252 if (nmtd->set != NULL && chip > nmtd->set->nr_chips) { 250 if (nmtd->set != NULL && chip > nmtd->set->nr_chips) {
253 printk(KERN_ERR PFX "chip %d out of range\n", chip); 251 dev_err(info->device, "invalid chip %d\n", chip);
254 return; 252 return;
255 } 253 }
256 254