aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/mtdblock.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2011-12-23 10:30:16 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-01-09 13:25:19 -0500
commit329ad399a9b3adf52c90637b21ca029fcf7f8795 (patch)
tree7aa7bb2609c25de7859c3a666f3ea90934609592 /drivers/mtd/mtdblock.c
parent04c601bfa4cb29c968dcb66e44c799c9c01d8675 (diff)
mtd: introduce mtd_read interface
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/mtdblock.c')
-rw-r--r--drivers/mtd/mtdblock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 9b01cb0266e4..b0644d2d2a6e 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -184,8 +184,8 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
184 mtdblk->cache_offset != sect_start) { 184 mtdblk->cache_offset != sect_start) {
185 /* fill the cache with the current sector */ 185 /* fill the cache with the current sector */
186 mtdblk->cache_state = STATE_EMPTY; 186 mtdblk->cache_state = STATE_EMPTY;
187 ret = mtd->read(mtd, sect_start, sect_size, 187 ret = mtd_read(mtd, sect_start, sect_size,
188 &retlen, mtdblk->cache_data); 188 &retlen, mtdblk->cache_data);
189 if (ret) 189 if (ret)
190 return ret; 190 return ret;
191 if (retlen != sect_size) 191 if (retlen != sect_size)
@@ -222,7 +222,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
222 mtd->name, pos, len); 222 mtd->name, pos, len);
223 223
224 if (!sect_size) 224 if (!sect_size)
225 return mtd->read(mtd, pos, len, &retlen, buf); 225 return mtd_read(mtd, pos, len, &retlen, buf);
226 226
227 while (len > 0) { 227 while (len > 0) {
228 unsigned long sect_start = (pos/sect_size)*sect_size; 228 unsigned long sect_start = (pos/sect_size)*sect_size;
@@ -241,7 +241,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
241 mtdblk->cache_offset == sect_start) { 241 mtdblk->cache_offset == sect_start) {
242 memcpy (buf, mtdblk->cache_data + offset, size); 242 memcpy (buf, mtdblk->cache_data + offset, size);
243 } else { 243 } else {
244 ret = mtd->read(mtd, pos, size, &retlen, buf); 244 ret = mtd_read(mtd, pos, size, &retlen, buf);
245 if (ret) 245 if (ret)
246 return ret; 246 return ret;
247 if (retlen != size) 247 if (retlen != size)