diff options
author | Brian Norris <computersforpeace@gmail.com> | 2011-06-07 19:01:54 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:05 -0400 |
commit | 0870066d7e6c85bbe37741137e4c4731501a98e0 (patch) | |
tree | 20b0c0e2417b222d18d0027e067dc55489db0940 /drivers/mtd/nand/nand_bbt.c | |
parent | 96166056076af59d40e5b5aec5b09611c74cc911 (diff) |
mtd: remove printk's for [kv][mz]alloc failures
When a memory allocation fails, the kernel will print out a backtrace
automatically. These print statements are unnecessary.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/nand/nand_bbt.c')
-rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index ba401662835e..8875d6db2455 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c | |||
@@ -1121,10 +1121,8 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd) | |||
1121 | * table. | 1121 | * table. |
1122 | */ | 1122 | */ |
1123 | this->bbt = kzalloc(len, GFP_KERNEL); | 1123 | this->bbt = kzalloc(len, GFP_KERNEL); |
1124 | if (!this->bbt) { | 1124 | if (!this->bbt) |
1125 | printk(KERN_ERR "nand_scan_bbt: Out of memory\n"); | ||
1126 | return -ENOMEM; | 1125 | return -ENOMEM; |
1127 | } | ||
1128 | 1126 | ||
1129 | /* | 1127 | /* |
1130 | * If no primary table decriptor is given, scan the device to build a | 1128 | * If no primary table decriptor is given, scan the device to build a |
@@ -1146,7 +1144,6 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd) | |||
1146 | len += (len >> this->page_shift) * mtd->oobsize; | 1144 | len += (len >> this->page_shift) * mtd->oobsize; |
1147 | buf = vmalloc(len); | 1145 | buf = vmalloc(len); |
1148 | if (!buf) { | 1146 | if (!buf) { |
1149 | printk(KERN_ERR "nand_bbt: Out of memory\n"); | ||
1150 | kfree(this->bbt); | 1147 | kfree(this->bbt); |
1151 | this->bbt = NULL; | 1148 | this->bbt = NULL; |
1152 | return -ENOMEM; | 1149 | return -ENOMEM; |
@@ -1195,10 +1192,8 @@ int nand_update_bbt(struct mtd_info *mtd, loff_t offs) | |||
1195 | len = (1 << this->bbt_erase_shift); | 1192 | len = (1 << this->bbt_erase_shift); |
1196 | len += (len >> this->page_shift) * mtd->oobsize; | 1193 | len += (len >> this->page_shift) * mtd->oobsize; |
1197 | buf = kmalloc(len, GFP_KERNEL); | 1194 | buf = kmalloc(len, GFP_KERNEL); |
1198 | if (!buf) { | 1195 | if (!buf) |
1199 | printk(KERN_ERR "nand_update_bbt: Out of memory\n"); | ||
1200 | return -ENOMEM; | 1196 | return -ENOMEM; |
1201 | } | ||
1202 | 1197 | ||
1203 | writeops = md != NULL ? 0x03 : 0x01; | 1198 | writeops = md != NULL ? 0x03 : 0x01; |
1204 | 1199 | ||
@@ -1307,10 +1302,8 @@ static int nand_create_default_bbt_descr(struct nand_chip *this) | |||
1307 | return -EINVAL; | 1302 | return -EINVAL; |
1308 | } | 1303 | } |
1309 | bd = kzalloc(sizeof(*bd), GFP_KERNEL); | 1304 | bd = kzalloc(sizeof(*bd), GFP_KERNEL); |
1310 | if (!bd) { | 1305 | if (!bd) |
1311 | printk(KERN_ERR "nand_create_default_bbt_descr: Out of memory\n"); | ||
1312 | return -ENOMEM; | 1306 | return -ENOMEM; |
1313 | } | ||
1314 | bd->options = this->bbt_options; | 1307 | bd->options = this->bbt_options; |
1315 | bd->offs = this->badblockpos; | 1308 | bd->offs = this->badblockpos; |
1316 | bd->len = (this->options & NAND_BUSWIDTH_16) ? 2 : 1; | 1309 | bd->len = (this->options & NAND_BUSWIDTH_16) ? 2 : 1; |