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

Commit 0612b9dd authored by Brian Norris's avatar Brian Norris Committed by Artem Bityutskiy
Browse files

mtd: rename MTD_OOB_* to MTD_OPS_* 



These modes are not necessarily for OOB only. Particularly, MTD_OOB_RAW
affected operations on in-band page data as well. To clarify these
options and to emphasize that their effect is applied per-operation, we
change the primary prefix to MTD_OPS_.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@intel.com>
parent 905c6bcd

drivers/mtd/devices/doc2000.c

+2 −2
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, 
	uint8_t *buf = ops->oobbuf;

	size_t len = ops->len;



	BUG_ON(ops->mode != MTD_OOB_PLACE);

	BUG_ON(ops->mode != MTD_OPS_PLACE_OOB);



	ofs += ops->ooboffs;
@@ -1091,7 +1091,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, 
	struct DiskOnChip *this = mtd->priv;

	int ret;



	BUG_ON(ops->mode != MTD_OOB_PLACE);

	BUG_ON(ops->mode != MTD_OPS_PLACE_OOB);



	mutex_lock(&this->lock);

	ret = doc_write_oob_nolock(mtd, ofs + ops->ooboffs, ops->len,

drivers/mtd/devices/doc2001.c

+2 −2
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, 
	uint8_t *buf = ops->oobbuf;

	size_t len = ops->len;



	BUG_ON(ops->mode != MTD_OOB_PLACE);

	BUG_ON(ops->mode != MTD_OPS_PLACE_OOB);



	ofs += ops->ooboffs;
@@ -689,7 +689,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, 
	uint8_t *buf = ops->oobbuf;

	size_t len = ops->len;



	BUG_ON(ops->mode != MTD_OOB_PLACE);

	BUG_ON(ops->mode != MTD_OPS_PLACE_OOB);



	ofs += ops->ooboffs;

drivers/mtd/devices/doc2001plus.c

+2 −2
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, 
	uint8_t *buf = ops->oobbuf;

	size_t len = ops->len;



	BUG_ON(ops->mode != MTD_OOB_PLACE);

	BUG_ON(ops->mode != MTD_OPS_PLACE_OOB);



	ofs += ops->ooboffs;
@@ -919,7 +919,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, 
	uint8_t *buf = ops->oobbuf;

	size_t len = ops->len;



	BUG_ON(ops->mode != MTD_OOB_PLACE);

	BUG_ON(ops->mode != MTD_OPS_PLACE_OOB);



	ofs += ops->ooboffs;

drivers/mtd/inftlcore.c

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len, 
	struct mtd_oob_ops ops;

	int res;



	ops.mode = MTD_OOB_PLACE;

	ops.mode = MTD_OPS_PLACE_OOB;

	ops.ooboffs = offs & (mtd->writesize - 1);

	ops.ooblen = len;

	ops.oobbuf = buf;
@@ -172,7 +172,7 @@ int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len, 
	struct mtd_oob_ops ops;

	int res;



	ops.mode = MTD_OOB_PLACE;

	ops.mode = MTD_OPS_PLACE_OOB;

	ops.ooboffs = offs & (mtd->writesize - 1);

	ops.ooblen = len;

	ops.oobbuf = buf;
@@ -192,7 +192,7 @@ static int inftl_write(struct mtd_info *mtd, loff_t offs, size_t len, 
	struct mtd_oob_ops ops;

	int res;



	ops.mode = MTD_OOB_PLACE;

	ops.mode = MTD_OPS_PLACE_OOB;

	ops.ooboffs = offs;

	ops.ooblen = mtd->oobsize;

	ops.oobbuf = oob;

drivers/mtd/mtdchar.c

+6 −4
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t 
		{

			struct mtd_oob_ops ops;



			ops.mode = MTD_OOB_RAW;

			ops.mode = MTD_OPS_RAW;

			ops.datbuf = kbuf;

			ops.oobbuf = NULL;

			ops.len = len;
@@ -317,7 +317,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count 
		{

			struct mtd_oob_ops ops;



			ops.mode = MTD_OOB_RAW;

			ops.mode = MTD_OPS_RAW;

			ops.datbuf = kbuf;

			ops.oobbuf = NULL;

			ops.ooboffs = 0;
@@ -413,7 +413,8 @@ static int mtd_do_writeoob(struct file *file, struct mtd_info *mtd, 
	ops.ooblen = length;

	ops.ooboffs = start & (mtd->writesize - 1);

	ops.datbuf = NULL;

	ops.mode = (mfi->mode == MTD_MODE_RAW) ? MTD_OOB_RAW : MTD_OOB_PLACE;

	ops.mode = (mfi->mode == MTD_MODE_RAW) ? MTD_OPS_RAW :

		MTD_OPS_PLACE_OOB;



	if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))

		return -EINVAL;
@@ -457,7 +458,8 @@ static int mtd_do_readoob(struct file *file, struct mtd_info *mtd, 
	ops.ooblen = length;

	ops.ooboffs = start & (mtd->writesize - 1);

	ops.datbuf = NULL;

	ops.mode = (mfi->mode == MTD_MODE_RAW) ? MTD_OOB_RAW : MTD_OOB_PLACE;

	ops.mode = (mfi->mode == MTD_MODE_RAW) ? MTD_OPS_RAW :

		MTD_OPS_PLACE_OOB;



	if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))

		return -EINVAL;