mtd: nand: convert printk() to pr_*()

[pandora-kernel.git] / drivers / mtd / nand / nand_bbt.c

diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 0d2eaa7..76f496d 100644 (file)
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -205,10 +205,10 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
                res = mtd->read(mtd, from, len, &retlen, buf);
                if (res < 0) {
                        if (retlen != len) {
-                               printk(KERN_INFO "nand_bbt: Error reading bad block table\n");
+                               pr_info("nand_bbt: Error reading bad block table\n");
                                return res;
                        }
-                       printk(KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");
+                       pr_warn("nand_bbt: ECC error while reading bad block table\n");
                }
 
                /* Analyse data */
@@ -219,7 +219,7 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                if (tmp == msk)
                                        continue;
                                if (reserved_block_code && (tmp == reserved_block_code)) {
-                                       printk(KERN_INFO "nand_read_bbt: Reserved block at 0x%012llx\n",
+                                       pr_info("nand_read_bbt: Reserved block at 0x%012llx\n",
                                               (loff_t)((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
                                        this->bbt[offs + (act >> 3)] |= 0x2 << (act & 0x06);
                                        mtd->ecc_stats.bbtblocks++;
@@ -229,7 +229,7 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                 * Leave it for now, if it's matured we can
                                 * move this message to pr_debug.
                                 */
-                               printk(KERN_INFO "nand_read_bbt: Bad block at 0x%012llx\n",
+                               pr_info("nand_read_bbt: Bad block at 0x%012llx\n",
                                       (loff_t)((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
                                /* Factory marked bad or worn out? */
                                if (tmp == 0)
@@ -389,7 +389,7 @@ static int read_abs_bbts(struct mtd_info *mtd, uint8_t *buf,
                scan_read_raw(mtd, buf, (loff_t)td->pages[0] << this->page_shift,
                              mtd->writesize, td);
                td->version[0] = buf[bbt_get_ver_offs(mtd, td)];
-               printk(KERN_INFO "Bad block table at page %d, version 0x%02X\n",
+               pr_info("Bad block table at page %d, version 0x%02X\n",
                       td->pages[0], td->version[0]);
        }
 
@@ -398,7 +398,7 @@ static int read_abs_bbts(struct mtd_info *mtd, uint8_t *buf,
                scan_read_raw(mtd, buf, (loff_t)md->pages[0] << this->page_shift,
                              mtd->writesize, td);
                md->version[0] = buf[bbt_get_ver_offs(mtd, md)];
-               printk(KERN_INFO "Bad block table at page %d, version 0x%02X\n",
+               pr_info("Bad block table at page %d, version 0x%02X\n",
                       md->pages[0], md->version[0]);
        }
        return 1;
@@ -473,7 +473,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
        loff_t from;
        size_t readlen;
 
-       printk(KERN_INFO "Scanning device for bad blocks\n");
+       pr_info("Scanning device for bad blocks\n");
 
        if (bd->options & NAND_BBT_SCANALLPAGES)
                len = 1 << (this->bbt_erase_shift - this->page_shift);
@@ -502,7 +502,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
                from = 0;
        } else {
                if (chip >= this->numchips) {
-                       printk(KERN_WARNING "create_bbt(): chipnr (%d) > available chips (%d)\n",
+                       pr_warn("create_bbt(): chipnr (%d) > available chips (%d)\n",
                               chip + 1, this->numchips);
                        return -EINVAL;
                }
@@ -531,7 +531,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
 
                if (ret) {
                        this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                       printk(KERN_WARNING "Bad eraseblock %d at 0x%012llx\n",
+                       pr_warn("Bad eraseblock %d at 0x%012llx\n",
                               i >> 1, (unsigned long long)from);
                        mtd->ecc_stats.badblocks++;
                }
@@ -614,9 +614,9 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
        /* Check, if we found a bbt for each requested chip */
        for (i = 0; i < chips; i++) {
                if (td->pages[i] == -1)
-                       printk(KERN_WARNING "Bad block table not found for chip %d\n", i);
+                       pr_warn("Bad block table not found for chip %d\n", i);
                else
-                       printk(KERN_INFO "Bad block table found at page %d, version 0x%02X\n", td->pages[i],
+                       pr_info("Bad block table found at page %d, version 0x%02X\n", td->pages[i],
                               td->version[i]);
        }
        return 0;
@@ -730,7 +730,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                        if (!md || md->pages[chip] != page)
                                goto write;
                }
-               printk(KERN_ERR "No space left to write bad block table\n");
+               pr_err("No space left to write bad block table\n");
                return -ENOSPC;
        write:
 
@@ -765,12 +765,12 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                        res = mtd->read(mtd, to, len, &retlen, buf);
                        if (res < 0) {
                                if (retlen != len) {
-                                       printk(KERN_INFO "nand_bbt: Error "
+                                       pr_info("nand_bbt: Error "
                                               "reading block for writing "
                                               "the bad block table\n");
                                        return res;
                                }
-                               printk(KERN_WARNING "nand_bbt: ECC error "
+                               pr_warn("nand_bbt: ECC error "
                                       "while reading block for writing "
                                       "bad block table\n");
                        }
@@ -847,7 +847,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                if (res < 0)
                        goto outerr;
 
-               printk(KERN_INFO "Bad block table written to 0x%012llx, version "
+               pr_info("Bad block table written to 0x%012llx, version "
                       "0x%02X\n", (unsigned long long)to, td->version[chip]);
 
                /* Mark it as used */
@@ -1137,7 +1137,7 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
         */
        if (!td) {
                if ((res = nand_memory_bbt(mtd, bd))) {
-                       printk(KERN_ERR "nand_bbt: Can't scan flash and build the RAM-based BBT\n");
+                       pr_err("nand_bbt: Can't scan flash and build the RAM-based BBT\n");
                        kfree(this->bbt);
                        this->bbt = NULL;
                }
@@ -1305,7 +1305,7 @@ static int nand_create_default_bbt_descr(struct nand_chip *this)
 {
        struct nand_bbt_descr *bd;
        if (this->badblock_pattern) {
-               printk(KERN_WARNING "BBT descr already allocated; not replacing.\n");
+               pr_warn("BBT descr already allocated; not replacing.\n");
                return -EINVAL;
        }
        bd = kzalloc(sizeof(*bd), GFP_KERNEL);