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>

diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index 3e24b379ffa42e8564df4e0be373ef2fe6aa21a5..ab81e9a5947ebe9e5fbb6540bd1cf20cb22d6537 100644 (file)
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -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)

diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index 0c1140b6c2863b92087d1b8156895a5a5162e664..acd991f4bf941a09d016f12cfea8def7e2c04433 100644 (file)
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -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)

diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c
index 266de04b6d29ef1666ab54ea05250411536ed0ef..2cdd0c47cac115d2381b7c8a0926985da4692148 100644 (file)
--- a/drivers/mtd/tests/mtd_readtest.c
+++ b/drivers/mtd/tests/mtd_readtest.c
@@ -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)

diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index a6ce9c1fa6c56c2cfcbc345e7fd53d323b7b7cbf..20b63d1ad494e6bd4deb6b95f525d6118b63e6c2 100644 (file)
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -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);
 

diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c
index 787f539d16ca436099826f0626bb4c57efe6da6d..3a95e61b535da0e41c717420c7615908f8dcf39b 100644 (file)
--- a/drivers/mtd/tests/mtd_stresstest.c
+++ b/drivers/mtd/tests/mtd_stresstest.c
@@ -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);

diff --git a/drivers/mtd/tests/mtd_subpagetest.c b/drivers/mtd/tests/mtd_subpagetest.c
index aade56f2794541f9d0545be12a0110f9ffe18ea1..e41a04f5caab3c8fd4322cc09729f3dd094b3ce4 100644 (file)
--- a/drivers/mtd/tests/mtd_subpagetest.c
+++ b/drivers/mtd/tests/mtd_subpagetest.c
@@ -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)