redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mtd: tests: don't print error messages when out-of-memory 

These strings are now unnecessary and discouraged in the kernel. The
kernel will have plenty of big scary messages if kmalloc fails. These
now only serve to bloat the module.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
hifive-unleashed-5.1
Brian Norris 2013-05-02 14:18:51 -07:00 committed by David Woodhouse
parent 59bff7fb7a
commit 33777e6676
6 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/tests/mtd_oobtest.c
View File

@ -320,10 +320,8 @@ static int scan_for_bad_eraseblocks(void)
int i, bad = 0;
bbt = kmalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
pr_err("error: cannot allocate memory\n");
if (!bbt)
return -ENOMEM;
}
pr_info("scanning for bad eraseblocks\n");
for (i = 0; i < ebcnt; ++i) {
@ -380,15 +378,11 @@ static int __init mtd_oobtest_init(void)
err = -ENOMEM;
readbuf = kmalloc(mtd->erasesize, GFP_KERNEL);
if (!readbuf) {
pr_err("error: cannot allocate memory\n");
if (!readbuf)
goto out;
}
writebuf = kmalloc(mtd->erasesize, GFP_KERNEL);
if (!writebuf) {
pr_err("error: cannot allocate memory\n");
if (!writebuf)
goto out;
}
err = scan_for_bad_eraseblocks();
if (err)

20
drivers/mtd/tests/mtd_pagetest.c
View File

@ -191,10 +191,8 @@ static int crosstest(void)
pr_info("crosstest\n");
pp1 = kmalloc(pgsize * 4, GFP_KERNEL);
if (!pp1) {
pr_err("error: cannot allocate memory\n");
if (!pp1)
return -ENOMEM;
}
pp2 = pp1 + pgsize;
pp3 = pp2 + pgsize;
pp4 = pp3 + pgsize;
@ -456,10 +454,8 @@ static int scan_for_bad_eraseblocks(void)
int i, bad = 0;
bbt = kzalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
pr_err("error: cannot allocate memory\n");
if (!bbt)
return -ENOMEM;
}
pr_info("scanning for bad eraseblocks\n");
for (i = 0; i < ebcnt; ++i) {
@ -516,20 +512,14 @@ static int __init mtd_pagetest_init(void)
err = -ENOMEM;
bufsize = pgsize * 2;
writebuf = kmalloc(mtd->erasesize, GFP_KERNEL);
if (!writebuf) {
pr_err("error: cannot allocate memory\n");
if (!writebuf)
goto out;
}
twopages = kmalloc(bufsize, GFP_KERNEL);
if (!twopages) {
pr_err("error: cannot allocate memory\n");
if (!twopages)
goto out;
}
boundary = kmalloc(bufsize, GFP_KERNEL);
if (!boundary) {
pr_err("error: cannot allocate memory\n");
if (!boundary)
goto out;
}
err = scan_for_bad_eraseblocks();
if (err)

12
drivers/mtd/tests/mtd_readtest.c
View File

@ -143,10 +143,8 @@ static int scan_for_bad_eraseblocks(void)
int i, bad = 0;
bbt = kzalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
pr_err("error: cannot allocate memory\n");
if (!bbt)
return -ENOMEM;
}
if (!mtd_can_have_bb(mtd))
return 0;
@ -204,15 +202,11 @@ static int __init mtd_readtest_init(void)
err = -ENOMEM;
iobuf = kmalloc(mtd->erasesize, GFP_KERNEL);
if (!iobuf) {
pr_err("error: cannot allocate memory\n");
if (!iobuf)
goto out;
}
iobuf1 = kmalloc(mtd->erasesize, GFP_KERNEL);
if (!iobuf1) {
pr_err("error: cannot allocate memory\n");
if (!iobuf1)
goto out;
}
err = scan_for_bad_eraseblocks();
if (err)

8
drivers/mtd/tests/mtd_speedtest.c
View File

@ -313,10 +313,8 @@ static int scan_for_bad_eraseblocks(void)
int i, bad = 0;
bbt = kzalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
pr_err("error: cannot allocate memory\n");
if (!bbt)
return -ENOMEM;
}
if (!mtd_can_have_bb(mtd))
goto out;
@ -384,10 +382,8 @@ static int __init mtd_speedtest_init(void)
err = -ENOMEM;
iobuf = kmalloc(mtd->erasesize, GFP_KERNEL);
if (!iobuf) {
pr_err("error: cannot allocate memory\n");
if (!iobuf)
goto out;
}
prandom_bytes(iobuf, mtd->erasesize);

8
drivers/mtd/tests/mtd_stresstest.c
View File

@ -202,10 +202,8 @@ static int scan_for_bad_eraseblocks(void)
int i, bad = 0;
bbt = kzalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
pr_err("error: cannot allocate memory\n");
if (!bbt)
return -ENOMEM;
}
if (!mtd_can_have_bb(mtd))
return 0;
@ -276,10 +274,8 @@ static int __init mtd_stresstest_init(void)
readbuf = vmalloc(bufsize);
writebuf = vmalloc(bufsize);
offsets = kmalloc(ebcnt * sizeof(int), GFP_KERNEL);
if (!readbuf || !writebuf || !offsets) {
pr_err("error: cannot allocate memory\n");
if (!readbuf || !writebuf || !offsets)
goto out;
}
for (i = 0; i < ebcnt; i++)
offsets[i] = mtd->erasesize;
prandom_bytes(writebuf, bufsize);

12
drivers/mtd/tests/mtd_subpagetest.c
View File

@ -333,10 +333,8 @@ static int scan_for_bad_eraseblocks(void)
int i, bad = 0;
bbt = kzalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
pr_err("error: cannot allocate memory\n");
if (!bbt)
return -ENOMEM;
}
pr_info("scanning for bad eraseblocks\n");
for (i = 0; i < ebcnt; ++i) {
@ -393,15 +391,11 @@ static int __init mtd_subpagetest_init(void)
err = -ENOMEM;
bufsize = subpgsize * 32;
writebuf = kmalloc(bufsize, GFP_KERNEL);
if (!writebuf) {
pr_info("error: cannot allocate memory\n");
if (!writebuf)
goto out;
}
readbuf = kmalloc(bufsize, GFP_KERNEL);
if (!readbuf) {
pr_info("error: cannot allocate memory\n");
if (!readbuf)
goto out;
}
err = scan_for_bad_eraseblocks();
if (err)