Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

Pull MTD changes from David Woodhouse:
 - Artem's cleanup of the MTD API continues apace.
 - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
   others.
 - More work on DiskOnChip G3, new driver for DiskOnChip G4.
 - Clean up debug/warning printks in JFFS2 to use pr_<level>.

Fix up various trivial conflicts, largely due to changes in calling
conventions for things like dmaengine_prep_slave_sg() (new inline
wrapper to hide new parameter, clashing with rewrite of previously last
parameter that used to be an 'append' flag, and is now a bitmap of
'unsigned long flags').

(Also some header file fallout - like so many merges this merge window -
and silly conflicts with sparse fixes)

* tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
  mtd: docg3 add protection against concurrency
  mtd: docg3 refactor cascade floors structure
  mtd: docg3 increase write/erase timeout
  mtd: docg3 fix inbound calculations
  mtd: nand: gpmi: fix function annotations
  mtd: phram: fix section mismatch for phram_setup
  mtd: unify initialization of erase_info->fail_addr
  mtd: support ONFI multi lun NAND
  mtd: sm_ftl: fix typo in major number.
  mtd: add device-tree support to spear_smi
  mtd: spear_smi: Remove default partition information from driver
  mtd: Add device-tree support to fsmc_nand
  mtd: fix section mismatch for doc_probe_device
  mtd: nand/fsmc: Remove sparse warnings and errors
  mtd: nand/fsmc: Add DMA support
  mtd: nand/fsmc: Access the NAND device word by word whenever possible
  mtd: nand/fsmc: Use dev_err to report error scenario
  mtd: nand/fsmc: Use devm routines
  mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
  mtd: fsmc_nand: add pm callbacks to support hibernation
  ...

1 files changed, 7 insertions, 18 deletions

diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index b1cdf6479019..a4eb8b5b85ec 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -562,14 +562,15 @@ void DoC2k_init(struct mtd_info *mtd)
 
         mtd->type = MTD_NANDFLASH;
         mtd->flags = MTD_CAP_NANDFLASH;
-        mtd->writesize = 512;
+        mtd->writebufsize = mtd->writesize = 512;
         mtd->oobsize = 16;
+        mtd->ecc_strength = 2;
         mtd->owner = THIS_MODULE;
-        mtd->erase = doc_erase;
-        mtd->read = doc_read;
-        mtd->write = doc_write;
-        mtd->read_oob = doc_read_oob;
-        mtd->write_oob = doc_write_oob;
+        mtd->_erase = doc_erase;
+        mtd->_read = doc_read;
+        mtd->_write = doc_write;
+        mtd->_read_oob = doc_read_oob;
+        mtd->_write_oob = doc_write_oob;
         this->curfloor = -1;
         this->curchip = -1;
         mutex_init(&this->lock);
@@ -602,13 +603,7 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,
         int i, len256 = 0, ret=0;
         size_t left = len;
 
-        /* Don't allow read past end of device */
-        if (from >= this->totlen)
-                return -EINVAL;
-
         mutex_lock(&this->lock);
-
-        *retlen = 0;
         while (left) {
                 len = left;
 
@@ -748,13 +743,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
         size_t left = len;
         int status;
 
-        /* Don't allow write past end of device */
-        if (to >= this->totlen)
-                return -EINVAL;
-
         mutex_lock(&this->lock);
-
-        *retlen = 0;
         while (left) {
                 len = left;