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, 5 insertions, 24 deletions

diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index 941bc3c05d6e..90b98822d9a4 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -174,11 +174,7 @@ static int gluebi_read(struct mtd_info *mtd, loff_t from, size_t len,
         int err = 0, lnum, offs, total_read;
         struct gluebi_device *gluebi;
 
-        if (len < 0 || from < 0 || from + len > mtd->size)
-                return -EINVAL;
-
         gluebi = container_of(mtd, struct gluebi_device, mtd);
-
         lnum = div_u64_rem(from, mtd->erasesize, &offs);
         total_read = len;
         while (total_read) {
@@ -218,14 +214,7 @@ static int gluebi_write(struct mtd_info *mtd, loff_t to, size_t len,
         int err = 0, lnum, offs, total_written;
         struct gluebi_device *gluebi;
 
-        if (len < 0 || to < 0 || len + to > mtd->size)
-                return -EINVAL;
-
         gluebi = container_of(mtd, struct gluebi_device, mtd);
-
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-
         lnum = div_u64_rem(to, mtd->erasesize, &offs);
 
         if (len % mtd->writesize || offs % mtd->writesize)
@@ -265,21 +254,13 @@ static int gluebi_erase(struct mtd_info *mtd, struct erase_info *instr)
         int err, i, lnum, count;
         struct gluebi_device *gluebi;
 
-        if (instr->addr < 0 || instr->addr > mtd->size - mtd->erasesize)
-                return -EINVAL;
-        if (instr->len < 0 || instr->addr + instr->len > mtd->size)
-                return -EINVAL;
         if (mtd_mod_by_ws(instr->addr, mtd) || mtd_mod_by_ws(instr->len, mtd))
                 return -EINVAL;
 
         lnum = mtd_div_by_eb(instr->addr, mtd);
         count = mtd_div_by_eb(instr->len, mtd);
-
         gluebi = container_of(mtd, struct gluebi_device, mtd);
 
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-
         for (i = 0; i < count - 1; i++) {
                 err = ubi_leb_unmap(gluebi->desc, lnum + i);
                 if (err)
@@ -340,11 +321,11 @@ static int gluebi_create(struct ubi_device_info *di,
         mtd->owner      = THIS_MODULE;
         mtd->writesize  = di->min_io_size;
         mtd->erasesize  = vi->usable_leb_size;
-        mtd->read       = gluebi_read;
-        mtd->write      = gluebi_write;
-        mtd->erase      = gluebi_erase;
-        mtd->get_device = gluebi_get_device;
-        mtd->put_device = gluebi_put_device;
+        mtd->_read       = gluebi_read;
+        mtd->_write      = gluebi_write;
+        mtd->_erase      = gluebi_erase;
+        mtd->_get_device = gluebi_get_device;
+        mtd->_put_device = gluebi_put_device;
 
         /*
          * In case of dynamic a volume, MTD device size is just volume size. In