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

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

mtd: introduce mtd_erase interface 



This patch is part of a patch-set which changes the MTD interface
from 'mtd->func()' form to 'mtd_func()' form. We need this because
we want to add common code to to all drivers in the mtd core level,
which is impossible with the current interface when MTD clients
call driver functions like 'read()' or 'write()' directly.

At this point we just introduce a new inline wrapper function, but
later some of them are expected to gain more code. E.g., the input
parameters check should be moved to the wrappers rather than be
duplicated at many drivers.

This particular patch introduced the 'mtd_erase()' interface. The
following patches add all the other interfaces one by one.

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

drivers/mtd/ftl.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int erase_xfer(partition_t *part, 
    erase->len = 1 << part->header.EraseUnitSize;

    erase->priv = (u_long)part;



    ret = part->mbd.mtd->erase(part->mbd.mtd, erase);

    ret = mtd_erase(part->mbd.mtd, erase);



    if (!ret)

	    xfer->EraseCount++;

drivers/mtd/inftlmount.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int find_boot_record(struct INFTLrecord *inftl) 
				 */

				instr->addr = ip->Reserved0 * inftl->EraseSize;

				instr->len = inftl->EraseSize;

				mtd->erase(mtd, instr);

				mtd_erase(mtd, instr);

			}

			if ((ip->lastUnit - ip->firstUnit + 1) < ip->virtualUnits) {

				printk(KERN_WARNING "INFTL: Media Header "
@@ -393,7 +393,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block) 
	   mark only the failed block in the bbt. */

	for (physblock = 0; physblock < inftl->EraseSize;

	     physblock += instr->len, instr->addr += instr->len) {

		mtd->erase(inftl->mbd.mtd, instr);

		mtd_erase(inftl->mbd.mtd, instr);



		if (instr->state == MTD_ERASE_FAILED) {

			printk(KERN_WARNING "INFTL: error while formatting block %d\n",

drivers/mtd/mtdblock.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos, 
	set_current_state(TASK_INTERRUPTIBLE);

	add_wait_queue(&wait_q, &wait);



	ret = mtd->erase(mtd, &erase);

	ret = mtd_erase(mtd, &erase);

	if (ret) {

		set_current_state(TASK_RUNNING);

		remove_wait_queue(&wait_q, &wait);

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) 
			  wq_head is no longer there when the

			  callback routine tries to wake us up.

			*/

			ret = mtd->erase(mtd, erase);

			ret = mtd_erase(mtd, erase);

			if (!ret) {

				set_current_state(TASK_UNINTERRUPTIBLE);

				add_wait_queue(&waitq, &wait);

drivers/mtd/mtdconcat.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int concat_dev_erase(struct mtd_info *mtd, struct erase_info *erase) 
	 * FIXME: Allow INTERRUPTIBLE. Which means

	 * not having the wait_queue head on the stack.

	 */

	err = mtd->erase(mtd, erase);

	err = mtd_erase(mtd, erase);

	if (!err) {

		set_current_state(TASK_UNINTERRUPTIBLE);

		add_wait_queue(&waitq, &wait);