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

MTD pull for 3.3

* tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
  mtd: Fix dependency for MTD_DOC200x
  mtd: do not use mtd->block_markbad directly
  logfs: do not use 'mtd->block_isbad' directly
  mtd: introduce mtd_can_have_bb helper
  mtd: do not use mtd->suspend and mtd->resume directly
  mtd: do not use mtd->lock, unlock and is_locked directly
  mtd: do not use mtd->sync directly
  mtd: harmonize mtd_writev usage
  mtd: do not use mtd->lock_user_prot_reg directly
  mtd: mtd->write_user_prot_reg directly
  mtd: do not use mtd->read_*_prot_reg directly
  mtd: do not use mtd->get_*_prot_info directly
  mtd: do not use mtd->read_oob directly
  mtd: mtdoops: do not use mtd->panic_write directly
  romfs: do not use mtd->get_unmapped_area directly
  mtd: do not use mtd->get_unmapped_area directly
  mtd: do use mtd->point directly
  mtd: introduce mtd_has_oob helper
  mtd: mtdcore: export symbols cleanup
  mtd: clean-up the default_mtd_writev function
  ...

Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index 976e3d28b962..ab2a52a039c3 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -122,9 +122,9 @@ static int get_valid_cis_sector(struct mtd_info *mtd)
          * is not SSFDC formatted
          */
         for (k = 0, offset = 0; k < 4; k++, offset += mtd->erasesize) {
-                if (!mtd->block_isbad(mtd, offset)) {
-                        ret = mtd->read(mtd, offset, SECTOR_SIZE, &retlen,
-                                sect_buf);
+                if (mtd_block_isbad(mtd, offset)) {
+                        ret = mtd_read(mtd, offset, SECTOR_SIZE, &retlen,
+                                       sect_buf);
 
                         /* CIS pattern match on the sector buffer */
                         if (ret < 0 || retlen != SECTOR_SIZE) {
@@ -156,7 +156,7 @@ static int read_physical_sector(struct mtd_info *mtd, uint8_t *sect_buf,
         size_t retlen;
         loff_t offset = (loff_t)sect_no << SECTOR_SHIFT;
 
-        ret = mtd->read(mtd, offset, SECTOR_SIZE, &retlen, sect_buf);
+        ret = mtd_read(mtd, offset, SECTOR_SIZE, &retlen, sect_buf);
         if (ret < 0 || retlen != SECTOR_SIZE)
                 return -1;
 
@@ -175,7 +175,7 @@ static int read_raw_oob(struct mtd_info *mtd, loff_t offs, uint8_t *buf)
         ops.oobbuf = buf;
         ops.datbuf = NULL;
 
-        ret = mtd->read_oob(mtd, offs, &ops);
+        ret = mtd_read_oob(mtd, offs, &ops);
         if (ret < 0 || ops.oobretlen != OOB_SIZE)
                 return -1;
 
@@ -255,7 +255,7 @@ static int build_logical_block_map(struct ssfdcr_record *ssfdc)
         for (phys_block = ssfdc->cis_block + 1; phys_block < ssfdc->map_len;
                         phys_block++) {
                 offset = (unsigned long)phys_block * ssfdc->erase_size;
-                if (mtd->block_isbad(mtd, offset))
+                if (mtd_block_isbad(mtd, offset))
                         continue;       /* skip bad blocks */
 
                 ret = read_raw_oob(mtd, offset, oob_buf);