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

mtd: utilize `mtd_is_*()' functions 



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

drivers/mtd/inftlcore.c

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned 
		ret = mtd->read(mtd, (inftl->EraseSize * BlockMap[block]) +

				(block * SECTORSIZE), SECTORSIZE, &retlen,

				movebuf);

		if (ret < 0 && ret != -EUCLEAN) {

		if (ret < 0 && !mtd_is_bitflip(ret)) {

			ret = mtd->read(mtd,

					(inftl->EraseSize * BlockMap[block]) +

					(block * SECTORSIZE), SECTORSIZE,
@@ -917,7 +917,7 @@ static int inftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block, 
		int ret = mtd->read(mtd, ptr, SECTORSIZE, &retlen, buffer);



		/* Handle corrected bit flips gracefully */

		if (ret < 0 && ret != -EUCLEAN)

		if (ret < 0 && !mtd_is_bitflip(ret))

			return -EIO;

	}

	return 0;

drivers/mtd/mtdchar.c

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t 
		 * Userspace software which accesses NAND this way

		 * must be aware of the fact that it deals with NAND

		 */

		if (!ret || (ret == -EUCLEAN) || (ret == -EBADMSG)) {

		if (!ret || mtd_is_bitflip_or_eccerr(ret)) {

			*ppos += retlen;

			if (copy_to_user(buf, kbuf, retlen)) {

				kfree(kbuf);
@@ -491,7 +491,7 @@ static int mtd_do_readoob(struct file *file, struct mtd_info *mtd, 
	 * does not calculate ECC for the OOB area, so do not rely on

	 * this behavior unless you have replaced it with your own.

	 */

	if (ret == -EUCLEAN || ret == -EBADMSG)

	if (mtd_is_bitflip_or_eccerr(ret))

		return 0;



	return ret;

drivers/mtd/mtdconcat.c

+4 −4
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len, 


		/* Save information about bitflips! */

		if (unlikely(err)) {

			if (err == -EBADMSG) {

			if (mtd_is_eccerr(err)) {

				mtd->ecc_stats.failed++;

				ret = err;

			} else if (err == -EUCLEAN) {

			} else if (mtd_is_bitflip(err)) {

				mtd->ecc_stats.corrected++;

				/* Do not overwrite -EBADMSG !! */

				if (!ret)
@@ -279,10 +279,10 @@ concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops) 


		/* Save information about bitflips! */

		if (unlikely(err)) {

			if (err == -EBADMSG) {

			if (mtd_is_eccerr(err)) {

				mtd->ecc_stats.failed++;

				ret = err;

			} else if (err == -EUCLEAN) {

			} else if (mtd_is_bitflip(err)) {

				mtd->ecc_stats.corrected++;

				/* Do not overwrite -EBADMSG !! */

				if (!ret)

drivers/mtd/mtdoops.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static void find_next_position(struct mtdoops_context *cxt) 
		ret = mtd->read(mtd, page * record_size, MTDOOPS_HEADER_SIZE,

				&retlen, (u_char *) &count[0]);

		if (retlen != MTDOOPS_HEADER_SIZE ||

				(ret < 0 && ret != -EUCLEAN)) {

				(ret < 0 && !mtd_is_bitflip(ret))) {

			printk(KERN_ERR "mtdoops: read failure at %ld (%td of %d read), err %d\n",

			       page * record_size, retlen,

			       MTDOOPS_HEADER_SIZE, ret);

drivers/mtd/mtdpart.c

+4 −4
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len, 
	res = part->master->read(part->master, from + part->offset,

				   len, retlen, buf);

	if (unlikely(res)) {

		if (res == -EUCLEAN)

		if (mtd_is_bitflip(res))

			mtd->ecc_stats.corrected += part->master->ecc_stats.corrected - stats.corrected;

		if (res == -EBADMSG)

		if (mtd_is_eccerr(res))

			mtd->ecc_stats.failed += part->master->ecc_stats.failed - stats.failed;

	}

	return res;
@@ -142,9 +142,9 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from, 


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

	if (unlikely(res)) {

		if (res == -EUCLEAN)

		if (mtd_is_bitflip(res))

			mtd->ecc_stats.corrected++;

		if (res == -EBADMSG)

		if (mtd_is_eccerr(res))

			mtd->ecc_stats.failed++;

	}

	return res;