Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

Pull MTD update from David Woodhouse:
 "Fairly unexciting MTD merge for 3.9:

   - misc clean-ups in the MTD command-line partitioning parser
     (cmdlinepart)
   - add flash locking support for STmicro chips serial flash chips, as
     well as for CFI command set 2 chips.
   - new driver for the ELM error correction HW module found in various
     TI chips, enable the OMAP NAND driver to use the ELM HW error
     correction
   - added number of new serial flash IDs
   - various fixes and improvements in the gpmi NAND driver
   - bcm47xx NAND driver improvements
   - make the mtdpart module actually removable"

* tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd: (45 commits)
  mtd: map: BUG() in non handled cases
  mtd: bcm47xxnflash: use pr_fmt for module prefix in messages
  mtd: davinci_nand: Use managed resources
  mtd: mtd_torturetest can cause stack overflows
  mtd: physmap_of: Convert device allocation to managed devm_kzalloc()
  mtd: at91: atmel_nand: for PMECC, add code to check the ONFI parameter ECC requirement.
  mtd: atmel_nand: make pmecc-cap, pmecc-sector-size in dts is optional.
  mtd: atmel_nand: avoid to report an error when lookup table offset is 0.
  mtd: bcm47xxsflash: adjust names of bus-specific functions
  mtd: bcm47xxpart: improve probing of nvram partition
  mtd: bcm47xxpart: add support for other erase sizes
  mtd: bcm47xxnflash: register this as normal driver
  mtd: bcm47xxnflash: fix message
  mtd: bcm47xxsflash: register this as normal driver
  mtd: bcm47xxsflash: write number of written bytes
  mtd: gpmi: add sanity check for the ECC
  mtd: gpmi: set the Golois Field bit for mx6q's BCH
  mtd: devices: elm: Removes <xx> literals in elm DT node
  mtd: gpmi: fix a dereferencing freed memory error
  mtd: fix the wrong timeo for panic_nand_wait()
  ...

3 files changed, 20 insertions, 23 deletions

diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c
index db2f22e7966a..70106607c247 100644
--- a/drivers/mtd/tests/mtd_nandecctest.c
+++ b/drivers/mtd/tests/mtd_nandecctest.c
@@ -44,7 +44,7 @@ struct nand_ecc_test {
 static void single_bit_error_data(void *error_data, void *correct_data,
                                 size_t size)
 {
-        unsigned int offset = random32() % (size * BITS_PER_BYTE);
+        unsigned int offset = prandom_u32() % (size * BITS_PER_BYTE);
 
         memcpy(error_data, correct_data, size);
         __change_bit_le(offset, error_data);
@@ -55,9 +55,9 @@ static void double_bit_error_data(void *error_data, void *correct_data,
 {
         unsigned int offset[2];
 
-        offset[0] = random32() % (size * BITS_PER_BYTE);
+        offset[0] = prandom_u32() % (size * BITS_PER_BYTE);
         do {
-                offset[1] = random32() % (size * BITS_PER_BYTE);
+                offset[1] = prandom_u32() % (size * BITS_PER_BYTE);
         } while (offset[0] == offset[1]);
 
         memcpy(error_data, correct_data, size);
@@ -68,7 +68,7 @@ static void double_bit_error_data(void *error_data, void *correct_data,
 
 static unsigned int random_ecc_bit(size_t size)
 {
-        unsigned int offset = random32() % (3 * BITS_PER_BYTE);
+        unsigned int offset = prandom_u32() % (3 * BITS_PER_BYTE);
 
         if (size == 256) {
                 /*
@@ -76,7 +76,7 @@ static unsigned int random_ecc_bit(size_t size)
                  * and 17th bit) in ECC code for 256 byte data block
                  */
                 while (offset == 16 || offset == 17)
-                        offset = random32() % (3 * BITS_PER_BYTE);
+                        offset = prandom_u32() % (3 * BITS_PER_BYTE);
         }
 
         return offset;
diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c
index 2d7e6cffd6d4..787f539d16ca 100644
--- a/drivers/mtd/tests/mtd_stresstest.c
+++ b/drivers/mtd/tests/mtd_stresstest.c
@@ -55,7 +55,7 @@ static int rand_eb(void)
         unsigned int eb;
 
 again:
-        eb = random32();
+        eb = prandom_u32();
         /* Read or write up 2 eraseblocks at a time - hence 'ebcnt - 1' */
         eb %= (ebcnt - 1);
         if (bbt[eb])
@@ -67,7 +67,7 @@ static int rand_offs(void)
 {
         unsigned int offs;
 
-        offs = random32();
+        offs = prandom_u32();
         offs %= bufsize;
         return offs;
 }
@@ -76,7 +76,7 @@ static int rand_len(int offs)
 {
         unsigned int len;
 
-        len = random32();
+        len = prandom_u32();
         len %= (bufsize - offs);
         return len;
 }
@@ -191,7 +191,7 @@ static int do_write(void)
 
 static int do_operation(void)
 {
-        if (random32() & 1)
+        if (prandom_u32() & 1)
                 return do_read();
         else
                 return do_write();
diff --git a/drivers/mtd/tests/mtd_torturetest.c b/drivers/mtd/tests/mtd_torturetest.c
index c4cde1e9eddb..3a9f6a6a79f9 100644
--- a/drivers/mtd/tests/mtd_torturetest.c
+++ b/drivers/mtd/tests/mtd_torturetest.c
@@ -208,7 +208,7 @@ static inline int write_pattern(int ebnum, void *buf)
 static int __init tort_init(void)
 {
         int err = 0, i, infinite = !cycles_count;
-        int bad_ebs[ebcnt];
+        int *bad_ebs;
 
         printk(KERN_INFO "\n");
         printk(KERN_INFO "=================================================\n");
@@ -250,28 +250,24 @@ static int __init tort_init(void)
 
         err = -ENOMEM;
         patt_5A5 = kmalloc(mtd->erasesize, GFP_KERNEL);
-        if (!patt_5A5) {
-                pr_err("error: cannot allocate memory\n");
+        if (!patt_5A5)
                 goto out_mtd;
-        }
 
         patt_A5A = kmalloc(mtd->erasesize, GFP_KERNEL);
-        if (!patt_A5A) {
-                pr_err("error: cannot allocate memory\n");
+        if (!patt_A5A)
                 goto out_patt_5A5;
-        }
 
         patt_FF = kmalloc(mtd->erasesize, GFP_KERNEL);
-        if (!patt_FF) {
-                pr_err("error: cannot allocate memory\n");
+        if (!patt_FF)
                 goto out_patt_A5A;
-        }
 
         check_buf = kmalloc(mtd->erasesize, GFP_KERNEL);
-        if (!check_buf) {
-                pr_err("error: cannot allocate memory\n");
+        if (!check_buf)
                 goto out_patt_FF;
-        }
+
+        bad_ebs = kcalloc(ebcnt, sizeof(*bad_ebs), GFP_KERNEL);
+        if (!bad_ebs)
+                goto out_check_buf;
 
         err = 0;
 
@@ -290,7 +286,6 @@ static int __init tort_init(void)
         /*
          * Check if there is a bad eraseblock among those we are going to test.
          */
-        memset(&bad_ebs[0], 0, sizeof(int) * ebcnt);
         if (mtd_can_have_bb(mtd)) {
                 for (i = eb; i < eb + ebcnt; i++) {
                         err = mtd_block_isbad(mtd, (loff_t)i * mtd->erasesize);
@@ -394,6 +389,8 @@ out:
 
         pr_info("finished after %u erase cycles\n",
                erase_cycles);
+        kfree(bad_ebs);
+out_check_buf:
         kfree(check_buf);
 out_patt_FF:
         kfree(patt_FF);