Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 298147
b: refs/heads/master
c: 994c840
h: refs/heads/master
i:
  298145: a56bd98
  298143: b4a8762
v: v3
  • Loading branch information
Mike Dunn authored and David Woodhouse committed Mar 26, 2012
1 parent 14ed6d9 commit 315753c
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31716a5ad32771be8339832b62aa030c263c6dac
refs/heads/master: 994c8409c4591983898182bfb5a0368d3daf1fc1
60 changes: 33 additions & 27 deletions trunk/drivers/mtd/mtdpart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len,
int res;

stats = part->master->ecc_stats;
res = mtd_read(part->master, from + part->offset, len, retlen, buf);
res = part->master->_read(part->master, from + part->offset, len,
retlen, buf);
if (unlikely(res)) {
if (mtd_is_bitflip(res))
mtd->ecc_stats.corrected += part->master->ecc_stats.corrected - stats.corrected;
Expand All @@ -80,15 +81,15 @@ static int part_point(struct mtd_info *mtd, loff_t from, size_t len,
{
struct mtd_part *part = PART(mtd);

return mtd_point(part->master, from + part->offset, len, retlen,
virt, phys);
return part->master->_point(part->master, from + part->offset, len,
retlen, virt, phys);
}

static int part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
{
struct mtd_part *part = PART(mtd);

return mtd_unpoint(part->master, from + part->offset, len);
return part->master->_unpoint(part->master, from + part->offset, len);
}

static unsigned long part_get_unmapped_area(struct mtd_info *mtd,
Expand All @@ -99,7 +100,8 @@ static unsigned long part_get_unmapped_area(struct mtd_info *mtd,
struct mtd_part *part = PART(mtd);

offset += part->offset;
return mtd_get_unmapped_area(part->master, len, offset, flags);
return part->master->_get_unmapped_area(part->master, len, offset,
flags);
}

static int part_read_oob(struct mtd_info *mtd, loff_t from,
Expand Down Expand Up @@ -130,7 +132,7 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
return -EINVAL;
}

res = mtd_read_oob(part->master, from + part->offset, ops);
res = part->master->_read_oob(part->master, from + part->offset, ops);
if (unlikely(res)) {
if (mtd_is_bitflip(res))
mtd->ecc_stats.corrected++;
Expand All @@ -144,43 +146,46 @@ static int part_read_user_prot_reg(struct mtd_info *mtd, loff_t from,
size_t len, size_t *retlen, u_char *buf)
{
struct mtd_part *part = PART(mtd);
return mtd_read_user_prot_reg(part->master, from, len, retlen, buf);
return part->master->_read_user_prot_reg(part->master, from, len,
retlen, buf);
}

static int part_get_user_prot_info(struct mtd_info *mtd,
struct otp_info *buf, size_t len)
{
struct mtd_part *part = PART(mtd);
return mtd_get_user_prot_info(part->master, buf, len);
return part->master->_get_user_prot_info(part->master, buf, len);
}

static int part_read_fact_prot_reg(struct mtd_info *mtd, loff_t from,
size_t len, size_t *retlen, u_char *buf)
{
struct mtd_part *part = PART(mtd);
return mtd_read_fact_prot_reg(part->master, from, len, retlen, buf);
return part->master->_read_fact_prot_reg(part->master, from, len,
retlen, buf);
}

static int part_get_fact_prot_info(struct mtd_info *mtd, struct otp_info *buf,
size_t len)
{
struct mtd_part *part = PART(mtd);
return mtd_get_fact_prot_info(part->master, buf, len);
return part->master->_get_fact_prot_info(part->master, buf, len);
}

static int part_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf)
{
struct mtd_part *part = PART(mtd);
return mtd_write(part->master, to + part->offset, len, retlen, buf);
return part->master->_write(part->master, to + part->offset, len,
retlen, buf);
}

static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf)
{
struct mtd_part *part = PART(mtd);
return mtd_panic_write(part->master, to + part->offset, len, retlen,
buf);
return part->master->_panic_write(part->master, to + part->offset, len,
retlen, buf);
}

static int part_write_oob(struct mtd_info *mtd, loff_t to,
Expand All @@ -192,29 +197,30 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
return -EINVAL;
if (ops->datbuf && to + ops->len > mtd->size)
return -EINVAL;
return mtd_write_oob(part->master, to + part->offset, ops);
return part->master->_write_oob(part->master, to + part->offset, ops);
}

static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,
size_t len, size_t *retlen, u_char *buf)
{
struct mtd_part *part = PART(mtd);
return mtd_write_user_prot_reg(part->master, from, len, retlen, buf);
return part->master->_write_user_prot_reg(part->master, from, len,
retlen, buf);
}

static int part_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
size_t len)
{
struct mtd_part *part = PART(mtd);
return mtd_lock_user_prot_reg(part->master, from, len);
return part->master->_lock_user_prot_reg(part->master, from, len);
}

static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen)
{
struct mtd_part *part = PART(mtd);
return mtd_writev(part->master, vecs, count, to + part->offset,
retlen);
return part->master->_writev(part->master, vecs, count,
to + part->offset, retlen);
}

static int part_erase(struct mtd_info *mtd, struct erase_info *instr)
Expand All @@ -223,7 +229,7 @@ static int part_erase(struct mtd_info *mtd, struct erase_info *instr)
int ret;

instr->addr += part->offset;
ret = mtd_erase(part->master, instr);
ret = part->master->_erase(part->master, instr);
if (ret) {
if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset;
Expand All @@ -249,44 +255,44 @@ EXPORT_SYMBOL_GPL(mtd_erase_callback);
static int part_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{
struct mtd_part *part = PART(mtd);
return mtd_lock(part->master, ofs + part->offset, len);
return part->master->_lock(part->master, ofs + part->offset, len);
}

static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{
struct mtd_part *part = PART(mtd);
return mtd_unlock(part->master, ofs + part->offset, len);
return part->master->_unlock(part->master, ofs + part->offset, len);
}

static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{
struct mtd_part *part = PART(mtd);
return mtd_is_locked(part->master, ofs + part->offset, len);
return part->master->_is_locked(part->master, ofs + part->offset, len);
}

static void part_sync(struct mtd_info *mtd)
{
struct mtd_part *part = PART(mtd);
mtd_sync(part->master);
part->master->_sync(part->master);
}

static int part_suspend(struct mtd_info *mtd)
{
struct mtd_part *part = PART(mtd);
return mtd_suspend(part->master);
return part->master->_suspend(part->master);
}

static void part_resume(struct mtd_info *mtd)
{
struct mtd_part *part = PART(mtd);
mtd_resume(part->master);
part->master->_resume(part->master);
}

static int part_block_isbad(struct mtd_info *mtd, loff_t ofs)
{
struct mtd_part *part = PART(mtd);
ofs += part->offset;
return mtd_block_isbad(part->master, ofs);
return part->master->_block_isbad(part->master, ofs);
}

static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)
Expand All @@ -295,7 +301,7 @@ static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)
int res;

ofs += part->offset;
res = mtd_block_markbad(part->master, ofs);
res = part->master->_block_markbad(part->master, ofs);
if (!res)
mtd->ecc_stats.badblocks++;
return res;
Expand Down

0 comments on commit 315753c

Please sign in to comment.