diff options
author | Ben Dooks <ben@simtec.co.uk> | 2005-09-26 17:42:57 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-06 16:37:35 -0500 |
commit | 0255fc1b081cf92b56dfe5e1f3a824d050326614 (patch) | |
tree | 06fe039a6359c0c8817298a816995c5bd81e776d /drivers | |
parent | 2bc9764c4837c6b7da540b7a2592ec02f9a14e47 (diff) |
[MTD] NAND: s3c2410 use dev_err() to report errors instead of printk()
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/nand/s3c2410.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 2df5e47d1f5c..44989c8b5f76 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * 20-Jun-2005 BJD Updated s3c2440 support, fixed timing bug | 18 | * 20-Jun-2005 BJD Updated s3c2440 support, fixed timing bug |
19 | * 08-Jul-2005 BJD Fix OOPS when no platform data supplied | 19 | * 08-Jul-2005 BJD Fix OOPS when no platform data supplied |
20 | * | 20 | * |
21 | * $Id: s3c2410.c,v 1.14 2005/07/06 20:05:06 bjd Exp $ | 21 | * $Id: s3c2410.c,v 1.15 2005/09/26 21:42:54 bjd Exp $ |
22 | * | 22 | * |
23 | * This program is free software; you can redistribute it and/or modify | 23 | * This program is free software; you can redistribute it and/or modify |
24 | * it under the terms of the GNU General Public License as published by | 24 | * it under the terms of the GNU General Public License as published by |
@@ -576,7 +576,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440) | |||
576 | 576 | ||
577 | info = kmalloc(sizeof(*info), GFP_KERNEL); | 577 | info = kmalloc(sizeof(*info), GFP_KERNEL); |
578 | if (info == NULL) { | 578 | if (info == NULL) { |
579 | printk(KERN_ERR PFX "no memory for flash info\n"); | 579 | dev_err("no memory for flash info\n"); |
580 | err = -ENOMEM; | 580 | err = -ENOMEM; |
581 | goto exit_error; | 581 | goto exit_error; |
582 | } | 582 | } |
@@ -591,7 +591,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440) | |||
591 | 591 | ||
592 | info->clk = clk_get(dev, "nand"); | 592 | info->clk = clk_get(dev, "nand"); |
593 | if (IS_ERR(info->clk)) { | 593 | if (IS_ERR(info->clk)) { |
594 | printk(KERN_ERR PFX "failed to get clock"); | 594 | dev_err(dev, "failed to get clock"); |
595 | err = -ENOENT; | 595 | err = -ENOENT; |
596 | goto exit_error; | 596 | goto exit_error; |
597 | } | 597 | } |
@@ -608,7 +608,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440) | |||
608 | info->area = request_mem_region(res->start, size, pdev->name); | 608 | info->area = request_mem_region(res->start, size, pdev->name); |
609 | 609 | ||
610 | if (info->area == NULL) { | 610 | if (info->area == NULL) { |
611 | printk(KERN_ERR PFX "cannot reserve register region\n"); | 611 | dev_err(dev, "cannot reserve register region\n"); |
612 | err = -ENOENT; | 612 | err = -ENOENT; |
613 | goto exit_error; | 613 | goto exit_error; |
614 | } | 614 | } |
@@ -619,12 +619,12 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440) | |||
619 | info->is_s3c2440 = is_s3c2440; | 619 | info->is_s3c2440 = is_s3c2440; |
620 | 620 | ||
621 | if (info->regs == NULL) { | 621 | if (info->regs == NULL) { |
622 | printk(KERN_ERR PFX "cannot reserve register region\n"); | 622 | dev_err(dev, "cannot reserve register region\n"); |
623 | err = -EIO; | 623 | err = -EIO; |
624 | goto exit_error; | 624 | goto exit_error; |
625 | } | 625 | } |
626 | 626 | ||
627 | printk(KERN_INFO PFX "mapped registers at %p\n", info->regs); | 627 | dev_dbg(dev, "mapped registers at %p\n", info->regs); |
628 | 628 | ||
629 | /* initialise the hardware */ | 629 | /* initialise the hardware */ |
630 | 630 | ||
@@ -642,7 +642,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440) | |||
642 | size = nr_sets * sizeof(*info->mtds); | 642 | size = nr_sets * sizeof(*info->mtds); |
643 | info->mtds = kmalloc(size, GFP_KERNEL); | 643 | info->mtds = kmalloc(size, GFP_KERNEL); |
644 | if (info->mtds == NULL) { | 644 | if (info->mtds == NULL) { |
645 | printk(KERN_ERR PFX "failed to allocate mtd storage\n"); | 645 | dev_err(dev, "failed to allocate mtd storage\n"); |
646 | err = -ENOMEM; | 646 | err = -ENOMEM; |
647 | goto exit_error; | 647 | goto exit_error; |
648 | } | 648 | } |