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

Pull MTD updates from Brian Norris:
 "NAND:
   - Add sunxi_nand randomizer support
   - begin refactoring NAND ecclayout structs
   - fix pxa3xx_nand dmaengine usage
   - brcmnand: fix support for v7.1 controller
   - add Qualcomm NAND controller driver

  SPI NOR:
   - add new ls1021a, ls2080a support to Freescale QuadSPI
   - add new flash ID entries
   - support bottom-block protection for Winbond flash
   - support Status Register Write Protect
   - remove broken QPI support for Micron SPI flash

  JFFS2:
   - improve post-mount CRC scan efficiency

  General:
   - refactor bcm63xxpart parser, to later extend for NAND
   - add writebuf size parameter to mtdram

  Other minor code quality improvements"

* tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd: (72 commits)
  mtd: nand: remove kerneldoc for removed function parameter
  mtd: nand: Qualcomm NAND controller driver
  dt/bindings: qcom_nandc: Add DT bindings
  mtd: nand: don't select chip in nand_chip's block_bad op
  mtd: spi-nor: support lock/unlock for a few Winbond chips
  mtd: spi-nor: add TB (Top/Bottom) protect support
  mtd: spi-nor: add SPI_NOR_HAS_LOCK flag
  mtd: spi-nor: use BIT() for flash_info flags
  mtd: spi-nor: disallow further writes to SR if WP# is low
  mtd: spi-nor: make lock/unlock bounds checks more obvious and robust
  mtd: spi-nor: silently drop lock/unlock for already locked/unlocked region
  mtd: spi-nor: wait for SR_WIP to clear on initial unlock
  mtd: nand: simplify nand_bch_init() usage
  mtd: mtdswap: remove useless if (!mtd->ecclayout) test
  mtd: create an mtd_oobavail() helper and make use of it
  mtd: kill the ecclayout->oobavail field
  mtd: nand: check status before reporting timeout
  mtd: bcm63xxpart: give width specifier an 'int', not 'size_t'
  mtd: mtdram: Add parameter for setting writebuf size
  mtd: nand: pxa3xx_nand: kill unused field 'drcmr_cmd'
  ...

1 files changed, 24 insertions, 25 deletions

diff --git a/drivers/mtd/tests/oobtest.c b/drivers/mtd/tests/oobtest.c
index 31762120eb56..1cb3f7758fb6 100644
--- a/drivers/mtd/tests/oobtest.c
+++ b/drivers/mtd/tests/oobtest.c
@@ -215,19 +215,19 @@ static int verify_eraseblock(int ebnum)
                         pr_info("ignoring error as within bitflip_limit\n");
                 }
 
-                if (use_offset != 0 || use_len < mtd->ecclayout->oobavail) {
+                if (use_offset != 0 || use_len < mtd->oobavail) {
                         int k;
 
                         ops.mode      = MTD_OPS_AUTO_OOB;
                         ops.len       = 0;
                         ops.retlen    = 0;
-                        ops.ooblen    = mtd->ecclayout->oobavail;
+                        ops.ooblen    = mtd->oobavail;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
                         ops.datbuf    = NULL;
                         ops.oobbuf    = readbuf;
                         err = mtd_read_oob(mtd, addr, &ops);
-                        if (err || ops.oobretlen != mtd->ecclayout->oobavail) {
+                        if (err || ops.oobretlen != mtd->oobavail) {
                                 pr_err("error: readoob failed at %#llx\n",
                                                 (long long)addr);
                                 errcnt += 1;
@@ -244,7 +244,7 @@ static int verify_eraseblock(int ebnum)
                         /* verify post-(use_offset + use_len) area for 0xff */
                         k = use_offset + use_len;
                         bitflips += memffshow(addr, k, readbuf + k,
-                                              mtd->ecclayout->oobavail - k);
+                                              mtd->oobavail - k);
 
                         if (bitflips > bitflip_limit) {
                                 pr_err("error: verify failed at %#llx\n",
@@ -269,8 +269,8 @@ static int verify_eraseblock_in_one_go(int ebnum)
         struct mtd_oob_ops ops;
         int err = 0;
         loff_t addr = (loff_t)ebnum * mtd->erasesize;
-        size_t len = mtd->ecclayout->oobavail * pgcnt;
-        size_t oobavail = mtd->ecclayout->oobavail;
+        size_t len = mtd->oobavail * pgcnt;
+        size_t oobavail = mtd->oobavail;
         size_t bitflips;
         int i;
 
@@ -394,8 +394,8 @@ static int __init mtd_oobtest_init(void)
                 goto out;
 
         use_offset = 0;
-        use_len = mtd->ecclayout->oobavail;
-        use_len_max = mtd->ecclayout->oobavail;
+        use_len = mtd->oobavail;
+        use_len_max = mtd->oobavail;
         vary_offset = 0;
 
         /* First test: write all OOB, read it back and verify */
@@ -460,8 +460,8 @@ static int __init mtd_oobtest_init(void)
 
         /* Write all eraseblocks */
         use_offset = 0;
-        use_len = mtd->ecclayout->oobavail;
-        use_len_max = mtd->ecclayout->oobavail;
+        use_len = mtd->oobavail;
+        use_len_max = mtd->oobavail;
         vary_offset = 1;
         prandom_seed_state(&rnd_state, 5);
 
@@ -471,8 +471,8 @@ static int __init mtd_oobtest_init(void)
 
         /* Check all eraseblocks */
         use_offset = 0;
-        use_len = mtd->ecclayout->oobavail;
-        use_len_max = mtd->ecclayout->oobavail;
+        use_len = mtd->oobavail;
+        use_len_max = mtd->oobavail;
         vary_offset = 1;
         prandom_seed_state(&rnd_state, 5);
         err = verify_all_eraseblocks();
@@ -480,8 +480,8 @@ static int __init mtd_oobtest_init(void)
                 goto out;
 
         use_offset = 0;
-        use_len = mtd->ecclayout->oobavail;
-        use_len_max = mtd->ecclayout->oobavail;
+        use_len = mtd->oobavail;
+        use_len_max = mtd->oobavail;
         vary_offset = 0;
 
         /* Fourth test: try to write off end of device */
@@ -501,7 +501,7 @@ static int __init mtd_oobtest_init(void)
         ops.retlen    = 0;
         ops.ooblen    = 1;
         ops.oobretlen = 0;
-        ops.ooboffs   = mtd->ecclayout->oobavail;
+        ops.ooboffs   = mtd->oobavail;
         ops.datbuf    = NULL;
         ops.oobbuf    = writebuf;
         pr_info("attempting to start write past end of OOB\n");
@@ -521,7 +521,7 @@ static int __init mtd_oobtest_init(void)
         ops.retlen    = 0;
         ops.ooblen    = 1;
         ops.oobretlen = 0;
-        ops.ooboffs   = mtd->ecclayout->oobavail;
+        ops.ooboffs   = mtd->oobavail;
         ops.datbuf    = NULL;
         ops.oobbuf    = readbuf;
         pr_info("attempting to start read past end of OOB\n");
@@ -543,7 +543,7 @@ static int __init mtd_oobtest_init(void)
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
-                ops.ooblen    = mtd->ecclayout->oobavail + 1;
+                ops.ooblen    = mtd->oobavail + 1;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
                 ops.datbuf    = NULL;
@@ -563,7 +563,7 @@ static int __init mtd_oobtest_init(void)
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
-                ops.ooblen    = mtd->ecclayout->oobavail + 1;
+                ops.ooblen    = mtd->oobavail + 1;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
                 ops.datbuf    = NULL;
@@ -587,7 +587,7 @@ static int __init mtd_oobtest_init(void)
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
-                ops.ooblen    = mtd->ecclayout->oobavail;
+                ops.ooblen    = mtd->oobavail;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 1;
                 ops.datbuf    = NULL;
@@ -607,7 +607,7 @@ static int __init mtd_oobtest_init(void)
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
-                ops.ooblen    = mtd->ecclayout->oobavail;
+                ops.ooblen    = mtd->oobavail;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 1;
                 ops.datbuf    = NULL;
@@ -638,7 +638,7 @@ static int __init mtd_oobtest_init(void)
         for (i = 0; i < ebcnt - 1; ++i) {
                 int cnt = 2;
                 int pg;
-                size_t sz = mtd->ecclayout->oobavail;
+                size_t sz = mtd->oobavail;
                 if (bbt[i] || bbt[i + 1])
                         continue;
                 addr = (loff_t)(i + 1) * mtd->erasesize - mtd->writesize;
@@ -673,13 +673,12 @@ static int __init mtd_oobtest_init(void)
         for (i = 0; i < ebcnt - 1; ++i) {
                 if (bbt[i] || bbt[i + 1])
                         continue;
-                prandom_bytes_state(&rnd_state, writebuf,
-                                        mtd->ecclayout->oobavail * 2);
+                prandom_bytes_state(&rnd_state, writebuf, mtd->oobavail * 2);
                 addr = (loff_t)(i + 1) * mtd->erasesize - mtd->writesize;
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
-                ops.ooblen    = mtd->ecclayout->oobavail * 2;
+                ops.ooblen    = mtd->oobavail * 2;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
                 ops.datbuf    = NULL;
@@ -688,7 +687,7 @@ static int __init mtd_oobtest_init(void)
                 if (err)
                         goto out;
                 if (memcmpshow(addr, readbuf, writebuf,
-                               mtd->ecclayout->oobavail * 2)) {
+                               mtd->oobavail * 2)) {
                         pr_err("error: verify failed at %#llx\n",
                                (long long)addr);
                         errcnt += 1;