Skip to content

Commit

Permalink
mtd: introduce mtd_write_oob interface
Browse files Browse the repository at this point in the history 
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
@dedekind
dedekind authored and David Woodhouse committed Jan 9, 2012
1 parent fd2819b commit a2cc5ba
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 27 deletions.
4 changes: 2 additions & 2 deletions drivers/mtd/inftlcore.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
ops.oobbuf = buf;
ops.datbuf = NULL;

res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
res = mtd_write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
*retlen = ops.oobretlen;
return res;
}
Expand All @@ -199,7 +199,7 @@ static int inftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
ops.datbuf = buf;
ops.len = len;

res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
res = mtd_write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
*retlen = ops.retlen;
return res;
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/mtd/mtdchar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t c
ops.ooboffs = 0;
ops.len = len;

ret = mtd->write_oob(mtd, *ppos, &ops);
ret = mtd_write_oob(mtd, *ppos, &ops);
retlen = ops.retlen;
break;
}
Expand Down Expand Up @@ -426,7 +426,7 @@ static int mtdchar_writeoob(struct file *file, struct mtd_info *mtd,
return PTR_ERR(ops.oobbuf);

start &= ~((uint64_t)mtd->writesize - 1);
ret = mtd->write_oob(mtd, start, &ops);
ret = mtd_write_oob(mtd, start, &ops);

if (ops.oobretlen > 0xFFFFFFFFU)
ret = -EOVERFLOW;
Expand Down Expand Up @@ -609,7 +609,7 @@ static int mtdchar_write_ioctl(struct mtd_info *mtd,
ops.oobbuf = NULL;
}

ret = mtd->write_oob(mtd, (loff_t)req.start, &ops);
ret = mtd_write_oob(mtd, (loff_t)req.start, &ops);

kfree(ops.datbuf);
kfree(ops.oobbuf);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/mtdconcat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)
if (to + devops.len > subdev->size)
devops.len = subdev->size - to;

err = subdev->write_oob(subdev, to, &devops);
err = mtd_write_oob(subdev, to, &devops);
ops->retlen += devops.oobretlen;
if (err)
return err;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/mtdpart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ 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 part->master->write_oob(part->master, to + part->offset, ops);
return mtd_write_oob(part->master, to + part->offset, ops);
}

static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,
Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/mtdswap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ static int mtdswap_write_marker(struct mtdswap_dev *d, struct swap_eb *eb,
offset = mtdswap_eb_offset(d, eb) + d->mtd->writesize;
}

ret = d->mtd->write_oob(d->mtd, offset , &ops);
ret = mtd_write_oob(d->mtd, offset, &ops);

if (ret) {
dev_warn(d->dev, "Write OOB failed for block at %08llx "
Expand Down Expand Up @@ -946,7 +946,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d,
patt = mtdswap_test_patt(test + i);
memset(d->page_buf, patt, mtd->writesize);
memset(d->oob_buf, patt, mtd->ecclayout->oobavail);
ret = mtd->write_oob(mtd, pos, &ops);
ret = mtd_write_oob(mtd, pos, &ops);
if (ret)
goto error;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/nand_bbt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
ops.oobbuf = oob;
ops.len = len;

return mtd->write_oob(mtd, offs, &ops);
return mtd_write_oob(mtd, offs, &ops);
}

static u32 bbt_get_ver_offs(struct mtd_info *mtd, struct nand_bbt_descr *td)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/sm_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs)
ops.datbuf = NULL;


ret = mtd->write_oob(mtd, ofs, &ops);
ret = mtd_write_oob(mtd, ofs, &ops);
if (ret < 0 || ops.oobretlen != SM_OOB_SIZE) {
printk(KERN_NOTICE
"sm_common: can't mark sector at %i as bad\n",
Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/nftlcore.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
ops.oobbuf = buf;
ops.datbuf = NULL;

res = mtd->write_oob(mtd, offs & ~mask, &ops);
res = mtd_write_oob(mtd, offs & ~mask, &ops);
*retlen = ops.oobretlen;
return res;
}
Expand All @@ -198,7 +198,7 @@ static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
ops.datbuf = buf;
ops.len = len;

res = mtd->write_oob(mtd, offs & ~mask, &ops);
res = mtd_write_oob(mtd, offs & ~mask, &ops);
*retlen = ops.retlen;
return res;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/sm_ftl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ static int sm_write_sector(struct sm_ftl *ftl,
ops.ooblen = SM_OOB_SIZE;
ops.oobbuf = (void *)oob;

ret = mtd->write_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &ops);
ret = mtd_write_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &ops);

/* Now we assume that hardware will catch write bitflip errors */
/* If you are paranoid, use CONFIG_MTD_NAND_VERIFY_WRITE */
Expand Down
10 changes: 5 additions & 5 deletions drivers/mtd/tests/mtd_oobtest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int write_eraseblock(int ebnum)
ops.ooboffs = use_offset;
ops.datbuf = NULL;
ops.oobbuf = writebuf;
err = mtd->write_oob(mtd, addr, &ops);
err = mtd_write_oob(mtd, addr, &ops);
if (err || ops.oobretlen != use_len) {
printk(PRINT_PREF "error: writeoob failed at %#llx\n",
(long long)addr);
Expand Down Expand Up @@ -524,7 +524,7 @@ static int __init mtd_oobtest_init(void)
ops.oobbuf = writebuf;
printk(PRINT_PREF "attempting to start write past end of OOB\n");
printk(PRINT_PREF "an error is expected...\n");
err = mtd->write_oob(mtd, addr0, &ops);
err = mtd_write_oob(mtd, addr0, &ops);
if (err) {
printk(PRINT_PREF "error occurred as expected\n");
err = 0;
Expand Down Expand Up @@ -568,7 +568,7 @@ static int __init mtd_oobtest_init(void)
ops.oobbuf = writebuf;
printk(PRINT_PREF "attempting to write past end of device\n");
printk(PRINT_PREF "an error is expected...\n");
err = mtd->write_oob(mtd, mtd->size - mtd->writesize, &ops);
err = mtd_write_oob(mtd, mtd->size - mtd->writesize, &ops);
if (err) {
printk(PRINT_PREF "error occurred as expected\n");
err = 0;
Expand Down Expand Up @@ -612,7 +612,7 @@ static int __init mtd_oobtest_init(void)
ops.oobbuf = writebuf;
printk(PRINT_PREF "attempting to write past end of device\n");
printk(PRINT_PREF "an error is expected...\n");
err = mtd->write_oob(mtd, mtd->size - mtd->writesize, &ops);
err = mtd_write_oob(mtd, mtd->size - mtd->writesize, &ops);
if (err) {
printk(PRINT_PREF "error occurred as expected\n");
err = 0;
Expand Down Expand Up @@ -670,7 +670,7 @@ static int __init mtd_oobtest_init(void)
ops.ooboffs = 0;
ops.datbuf = NULL;
ops.oobbuf = writebuf;
err = mtd->write_oob(mtd, addr, &ops);
err = mtd_write_oob(mtd, addr, &ops);
if (err)
goto out;
if (i % 256 == 0)
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/spectra/lld_mtd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ u16 mtd_Write_Page_Main_Spare(u8 *write_data, u32 Block,
ops.ooblen = BTSIG_BYTES;
ops.ooboffs = 0;

ret = spectra_mtd->write_oob(spectra_mtd,
(Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
&ops);
ret = mtd_write_oob(spectra_mtd,
(Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
&ops);
if (ret) {
printk(KERN_ERR "%s failed %d\n", __func__, ret);
return FAIL;
Expand Down
2 changes: 1 addition & 1 deletion fs/jffs2/wbuf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ int jffs2_write_nand_cleanmarker(struct jffs2_sb_info *c,
ops.len = ops.ooboffs = ops.retlen = ops.oobretlen = 0;
ops.datbuf = NULL;

ret = c->mtd->write_oob(c->mtd, jeb->offset, &ops);
ret = mtd_write_oob(c->mtd, jeb->offset, &ops);
if (ret || ops.oobretlen != ops.ooblen) {
printk(KERN_ERR "cannot write OOB for EB at %08x, requested %zd"
" bytes, read %zd bytes, error %d\n",
Expand Down
12 changes: 8 additions & 4 deletions include/linux/mtd/mtd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,14 @@ struct mtd_info {
size_t *retlen, const u_char *buf);
int (*read_oob) (struct mtd_info *mtd, loff_t from,
struct mtd_oob_ops *ops);
int (*write_oob) (struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops);

/* Backing device capabilities for this device
* - provides mmap capabilities
*/
struct backing_dev_info *backing_dev_info;


int (*write_oob) (struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops);

/*
* Methods to access the protection register area, present in some
* flash devices. The user data is one time programmable but the
Expand Down Expand Up @@ -326,6 +324,12 @@ static inline int mtd_read_oob(struct mtd_info *mtd, loff_t from,
return mtd->read_oob(mtd, from, ops);
}

static inline int mtd_write_oob(struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops)
{
return mtd->write_oob(mtd, to, ops);
}

static inline struct mtd_info *dev_to_mtd(struct device *dev)
{
return dev ? dev_get_drvdata(dev) : NULL;
Expand Down

0 comments on commit a2cc5ba

Please sign in to comment.