Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 274911
b: refs/heads/master
c: 9a4d4d6
h: refs/heads/master
i:
  274909: 1461d2d
  274907: c27128c
  274903: 6ce590a
  274895: dcdf6d5
  274879: 3cf0aa4
v: v3
  • Loading branch information
Brian Norris authored and Artem Bityutskiy committed Sep 11, 2011
1 parent ca7efc3 commit 4084cb3
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a0f5080ecc1c75f9c08591d9b0f48451e7ac8ddc
refs/heads/master: 9a4d4d69018e7b719ba58fa30fcdd60e547776b8
44 changes: 22 additions & 22 deletions trunk/drivers/mtd/nand/nand_base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2179,7 +2179,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,

/* Reject writes, which are not page aligned */
if (NOTALIGNED(to) || NOTALIGNED(ops->len)) {
printk(KERN_NOTICE "%s: Attempt to write not "
pr_notice("%s: Attempt to write not "
"page aligned data\n", __func__);
return -EINVAL;
}
Expand Down Expand Up @@ -2570,7 +2570,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
/* Heck if we have a bad block, we do not erase bad blocks! */
if (nand_block_checkbad(mtd, ((loff_t) page) <<
chip->page_shift, 0, allowbbt)) {
printk(KERN_WARNING "%s: attempt to erase a bad block "
pr_warn("%s: attempt to erase a bad block "
"at page 0x%08x\n", __func__, page);
instr->state = MTD_ERASE_FAILED;
goto erase_exit;
Expand Down Expand Up @@ -2744,7 +2744,7 @@ static void nand_resume(struct mtd_info *mtd)
if (chip->state == FL_PM_SUSPENDED)
nand_release_device(mtd);
else
printk(KERN_ERR "%s called for a chip which is not "
pr_err("%s called for a chip which is not "
"in suspended state\n", __func__);
}

Expand Down Expand Up @@ -2836,13 +2836,13 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
chip->read_byte(mtd) != 'F' || chip->read_byte(mtd) != 'I')
return 0;

printk(KERN_INFO "ONFI flash detected\n");
pr_info("ONFI flash detected\n");
chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);
for (i = 0; i < 3; i++) {
chip->read_buf(mtd, (uint8_t *)p, sizeof(*p));
if (onfi_crc16(ONFI_CRC_BASE, (uint8_t *)p, 254) ==
le16_to_cpu(p->crc)) {
printk(KERN_INFO "ONFI param page %d valid\n", i);
pr_info("ONFI param page %d valid\n", i);
break;
}
}
Expand All @@ -2866,7 +2866,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
chip->onfi_version = 0;

if (!chip->onfi_version) {
printk(KERN_INFO "%s: unsupported ONFI version: %d\n",
pr_info("%s: unsupported ONFI version: %d\n",
__func__, val);
return 0;
}
Expand Down Expand Up @@ -2932,7 +2932,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
id_data[i] = chip->read_byte(mtd);

if (id_data[0] != *maf_id || id_data[1] != *dev_id) {
printk(KERN_INFO "%s: second ID read did not match "
pr_info("%s: second ID read did not match "
"%02x,%02x against %02x,%02x\n", __func__,
*maf_id, *dev_id, id_data[0], id_data[1]);
return ERR_PTR(-ENODEV);
Expand Down Expand Up @@ -3077,10 +3077,10 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
* chip correct!
*/
if (busw != (chip->options & NAND_BUSWIDTH_16)) {
printk(KERN_INFO "NAND device: Manufacturer ID:"
pr_info("NAND device: Manufacturer ID:"
" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id,
*dev_id, nand_manuf_ids[maf_idx].name, mtd->name);
printk(KERN_WARNING "NAND bus width %d instead %d bit\n",
pr_warn("NAND bus width %d instead %d bit\n",
(chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
busw ? 16 : 8);
return ERR_PTR(-EINVAL);
Expand Down Expand Up @@ -3138,7 +3138,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
chip->cmdfunc = nand_command_lp;

printk(KERN_INFO "NAND device: Manufacturer ID:"
pr_info("NAND device: Manufacturer ID:"
" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id,
nand_manuf_ids[maf_idx].name,
chip->onfi_version ? chip->onfi_params.model : type->name);
Expand Down Expand Up @@ -3175,7 +3175,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,

if (IS_ERR(type)) {
if (!(chip->options & NAND_SCAN_SILENT_NODEV))
printk(KERN_WARNING "No NAND device found.\n");
pr_warn("No NAND device found.\n");
chip->select_chip(mtd, -1);
return PTR_ERR(type);
}
Expand All @@ -3193,7 +3193,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
break;
}
if (i > 1)
printk(KERN_INFO "%d NAND chips detected\n", i);
pr_info("%d NAND chips detected\n", i);

/* Store the number of chips and calc total size for mtd */
chip->numchips = i;
Expand Down Expand Up @@ -3243,7 +3243,7 @@ int nand_scan_tail(struct mtd_info *mtd)
chip->ecc.layout = &nand_oob_128;
break;
default:
printk(KERN_WARNING "No oob scheme defined for "
pr_warn("No oob scheme defined for "
"oobsize %d\n", mtd->oobsize);
BUG();
}
Expand All @@ -3262,7 +3262,7 @@ int nand_scan_tail(struct mtd_info *mtd)
/* Similar to NAND_ECC_HW, but a separate read_page handle */
if (!chip->ecc.calculate || !chip->ecc.correct ||
!chip->ecc.hwctl) {
printk(KERN_WARNING "No ECC functions supplied; "
pr_warn("No ECC functions supplied; "
"Hardware ECC not possible\n");
BUG();
}
Expand Down Expand Up @@ -3291,7 +3291,7 @@ int nand_scan_tail(struct mtd_info *mtd)
chip->ecc.read_page == nand_read_page_hwecc ||
!chip->ecc.write_page ||
chip->ecc.write_page == nand_write_page_hwecc)) {
printk(KERN_WARNING "No ECC functions supplied; "
pr_warn("No ECC functions supplied; "
"Hardware ECC not possible\n");
BUG();
}
Expand All @@ -3311,7 +3311,7 @@ int nand_scan_tail(struct mtd_info *mtd)

if (mtd->writesize >= chip->ecc.size)
break;
printk(KERN_WARNING "%d byte HW ECC not possible on "
pr_warn("%d byte HW ECC not possible on "
"%d byte page size, fallback to SW ECC\n",
chip->ecc.size, mtd->writesize);
chip->ecc.mode = NAND_ECC_SOFT;
Expand All @@ -3333,7 +3333,7 @@ int nand_scan_tail(struct mtd_info *mtd)

case NAND_ECC_SOFT_BCH:
if (!mtd_nand_has_bch()) {
printk(KERN_WARNING "CONFIG_MTD_ECC_BCH not enabled\n");
pr_warn("CONFIG_MTD_ECC_BCH not enabled\n");
BUG();
}
chip->ecc.calculate = nand_bch_calculate_ecc;
Expand All @@ -3360,13 +3360,13 @@ int nand_scan_tail(struct mtd_info *mtd)
chip->ecc.bytes,
&chip->ecc.layout);
if (!chip->ecc.priv) {
printk(KERN_WARNING "BCH ECC initialization failed!\n");
pr_warn("BCH ECC initialization failed!\n");
BUG();
}
break;

case NAND_ECC_NONE:
printk(KERN_WARNING "NAND_ECC_NONE selected by board driver. "
pr_warn("NAND_ECC_NONE selected by board driver. "
"This is not recommended !!\n");
chip->ecc.read_page = nand_read_page_raw;
chip->ecc.write_page = nand_write_page_raw;
Expand All @@ -3379,7 +3379,7 @@ int nand_scan_tail(struct mtd_info *mtd)
break;

default:
printk(KERN_WARNING "Invalid NAND_ECC_MODE %d\n",
pr_warn("Invalid NAND_ECC_MODE %d\n",
chip->ecc.mode);
BUG();
}
Expand All @@ -3401,7 +3401,7 @@ int nand_scan_tail(struct mtd_info *mtd)
*/
chip->ecc.steps = mtd->writesize / chip->ecc.size;
if (chip->ecc.steps * chip->ecc.size != mtd->writesize) {
printk(KERN_WARNING "Invalid ECC parameters\n");
pr_warn("Invalid ECC parameters\n");
BUG();
}
chip->ecc.total = chip->ecc.steps * chip->ecc.bytes;
Expand Down Expand Up @@ -3492,7 +3492,7 @@ int nand_scan(struct mtd_info *mtd, int maxchips)

/* Many callers got this wrong, so check for it for a while... */
if (!mtd->owner && caller_is_module()) {
printk(KERN_CRIT "%s called with NULL mtd->owner!\n",
pr_crit("%s called with NULL mtd->owner!\n",
__func__);
BUG();
}
Expand Down
34 changes: 17 additions & 17 deletions trunk/drivers/mtd/nand/nand_bbt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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++;
Expand All @@ -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)
Expand Down Expand Up @@ -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]);
}

Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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++;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4084cb3

Please sign in to comment.