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

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

mtd: introduce mtd_read_oob interface 



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

drivers/mtd/inftlcore.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len, 
	ops.oobbuf = buf;

	ops.datbuf = NULL;



	res = mtd->read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);

	res = mtd_read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);

	*retlen = ops.oobretlen;

	return res;

}

drivers/mtd/mtdchar.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count, 
			ops.oobbuf = NULL;

			ops.len = len;



			ret = mtd->read_oob(mtd, *ppos, &ops);

			ret = mtd_read_oob(mtd, *ppos, &ops);

			retlen = ops.retlen;

			break;

		}
@@ -471,7 +471,7 @@ static int mtdchar_readoob(struct file *file, struct mtd_info *mtd, 
		return -ENOMEM;



	start &= ~((uint64_t)mtd->writesize - 1);

	ret = mtd->read_oob(mtd, start, &ops);

	ret = mtd_read_oob(mtd, start, &ops);



	if (put_user(ops.oobretlen, retp))

		ret = -EFAULT;

drivers/mtd/mtdconcat.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops) 
		if (from + devops.len > subdev->size)

			devops.len = subdev->size - from;



		err = subdev->read_oob(subdev, from, &devops);

		err = mtd_read_oob(subdev, from, &devops);

		ops->retlen += devops.retlen;

		ops->oobretlen += devops.oobretlen;

drivers/mtd/mtdpart.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from, 
			return -EINVAL;

	}



	res = part->master->read_oob(part->master, from + part->offset, ops);

	res = mtd_read_oob(part->master, from + part->offset, ops);

	if (unlikely(res)) {

		if (mtd_is_bitflip(res))

			mtd->ecc_stats.corrected++;

drivers/mtd/mtdswap.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int mtdswap_handle_write_error(struct mtdswap_dev *d, struct swap_eb *eb) 
static int mtdswap_read_oob(struct mtdswap_dev *d, loff_t from,

			struct mtd_oob_ops *ops)

{

	int ret = d->mtd->read_oob(d->mtd, from, ops);

	int ret = mtd_read_oob(d->mtd, from, ops);



	if (mtd_is_bitflip(ret))

		return ret;
@@ -955,7 +955,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d, 


		pos = base;

		for (i = 0; i < mtd_pages; i++) {

			ret = mtd->read_oob(mtd, pos, &ops);

			ret = mtd_read_oob(mtd, pos, &ops);

			if (ret)

				goto error;