Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2cc5ba0 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: introduce mtd_write_oob interface 



Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent fd2819bb

drivers/mtd/inftlcore.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}
@@ -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;

}

drivers/mtd/mtdchar.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}
@@ -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;
@@ -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);

drivers/mtd/mtdconcat.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mtd/mtdpart.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/mtd/mtdswap.c

+2 −2
Original line number Diff line number Diff line
@@ -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 "
@@ -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;