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

mtd: introduce mtd_write interface 



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

drivers/mtd/chips/cfi_cmdset_0020.c

+5 −3
Original line number Diff line number Diff line
@@ -699,7 +699,8 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, 
				continue;

			}

			memcpy(buffer+buflen, elem_base, ECCBUF_SIZE-buflen);

			ret = mtd->write(mtd, to, ECCBUF_SIZE, &thislen, buffer);

			ret = mtd_write(mtd, to, ECCBUF_SIZE, &thislen,

					buffer);

			totlen += thislen;

			if (ret || thislen != ECCBUF_SIZE)

				goto write_error;
@@ -708,7 +709,8 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, 
			to += ECCBUF_SIZE;

		}

		if (ECCBUF_DIV(elem_len)) { /* write clean aligned data */

			ret = mtd->write(mtd, to, ECCBUF_DIV(elem_len), &thislen, elem_base);

			ret = mtd_write(mtd, to, ECCBUF_DIV(elem_len),

					&thislen, elem_base);

			totlen += thislen;

			if (ret || thislen != ECCBUF_DIV(elem_len))

				goto write_error;
@@ -722,7 +724,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, 
	}

	if (buflen) { /* flush last page, even if not full */

		/* This is sometimes intended behaviour, really */

		ret = mtd->write(mtd, to, buflen, &thislen, buffer);

		ret = mtd_write(mtd, to, buflen, &thislen, buffer);

		totlen += thislen;

		if (ret || thislen != ECCBUF_SIZE)

			goto write_error;

drivers/mtd/ftl.c

+18 −17
Original line number Diff line number Diff line
@@ -422,8 +422,8 @@ static int prepare_xfer(partition_t *part, int i) 
    header.LogicalEUN = cpu_to_le16(0xffff);

    header.EraseCount = cpu_to_le32(xfer->EraseCount);



    ret = part->mbd.mtd->write(part->mbd.mtd, xfer->Offset, sizeof(header),

			   &retlen, (u_char *)&header);

    ret = mtd_write(part->mbd.mtd, xfer->Offset, sizeof(header), &retlen,

                    (u_char *)&header);



    if (ret) {

	return ret;
@@ -438,8 +438,8 @@ static int prepare_xfer(partition_t *part, int i) 


    for (i = 0; i < nbam; i++, offset += sizeof(uint32_t)) {



	ret = part->mbd.mtd->write(part->mbd.mtd, offset, sizeof(uint32_t),

			       &retlen, (u_char *)&ctl);

	ret = mtd_write(part->mbd.mtd, offset, sizeof(uint32_t), &retlen,

                        (u_char *)&ctl);



	if (ret)

	    return ret;
@@ -503,8 +503,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit, 
    offset = xfer->Offset + 20; /* Bad! */

    unit = cpu_to_le16(0x7fff);



    ret = part->mbd.mtd->write(part->mbd.mtd, offset, sizeof(uint16_t),

			   &retlen, (u_char *) &unit);

    ret = mtd_write(part->mbd.mtd, offset, sizeof(uint16_t), &retlen,

                    (u_char *)&unit);



    if (ret) {

	printk( KERN_WARNING "ftl: Failed to write back to BAM cache in copy_erase_unit()!\n");
@@ -531,8 +531,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit, 
            }





	    ret = part->mbd.mtd->write(part->mbd.mtd, dest, SECTOR_SIZE,

                        &retlen, (u_char *) buf);

	    ret = mtd_write(part->mbd.mtd, dest, SECTOR_SIZE, &retlen,

                            (u_char *)buf);

	    if (ret)  {

		printk(KERN_WARNING "ftl: Error writing new xfer unit in copy_erase_unit\n");

		return ret;
@@ -550,8 +550,10 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit, 
    }



    /* Write the BAM to the transfer unit */

    ret = part->mbd.mtd->write(part->mbd.mtd, xfer->Offset + le32_to_cpu(part->header.BAMOffset),

                    part->BlocksPerUnit * sizeof(int32_t), &retlen,

    ret = mtd_write(part->mbd.mtd,

                    xfer->Offset + le32_to_cpu(part->header.BAMOffset),

                    part->BlocksPerUnit * sizeof(int32_t),

                    &retlen,

                    (u_char *)part->bam_cache);

    if (ret) {

	printk( KERN_WARNING "ftl: Error writing BAM in copy_erase_unit\n");
@@ -560,7 +562,7 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit, 




    /* All clear? Then update the LogicalEUN again */

    ret = part->mbd.mtd->write(part->mbd.mtd, xfer->Offset + 20, sizeof(uint16_t),

    ret = mtd_write(part->mbd.mtd, xfer->Offset + 20, sizeof(uint16_t),

                    &retlen, (u_char *)&srcunitswap);



    if (ret) {
@@ -887,8 +889,8 @@ static int set_bam_entry(partition_t *part, uint32_t log_addr, 
#endif

	part->bam_cache[blk] = le_virt_addr;

    }

    ret = part->mbd.mtd->write(part->mbd.mtd, offset, sizeof(uint32_t),

                            &retlen, (u_char *)&le_virt_addr);

    ret = mtd_write(part->mbd.mtd, offset, sizeof(uint32_t), &retlen,

                    (u_char *)&le_virt_addr);



    if (ret) {

	printk(KERN_NOTICE "ftl_cs: set_bam_entry() failed!\n");
@@ -947,8 +949,7 @@ static int ftl_write(partition_t *part, caddr_t buffer, 
	part->EUNInfo[part->bam_index].Deleted++;

	offset = (part->EUNInfo[part->bam_index].Offset +

		      blk * SECTOR_SIZE);

	ret = part->mbd.mtd->write(part->mbd.mtd, offset, SECTOR_SIZE, &retlen,

                                     buffer);

	ret = mtd_write(part->mbd.mtd, offset, SECTOR_SIZE, &retlen, buffer);



	if (ret) {

	    printk(KERN_NOTICE "ftl_cs: block write failed!\n");

drivers/mtd/mtdblock.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos, 
	 * Next, write the data to flash.

	 */



	ret = mtd->write(mtd, pos, len, &retlen, buf);

	ret = mtd_write(mtd, pos, len, &retlen, buf);

	if (ret)

		return ret;

	if (retlen != len)
@@ -152,7 +152,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos, 
		mtd->name, pos, len);



	if (!sect_size)

		return mtd->write(mtd, pos, len, &retlen, buf);

		return mtd_write(mtd, pos, len, &retlen, buf);



	while (len > 0) {

		unsigned long sect_start = (pos/sect_size)*sect_size;

drivers/mtd/mtdblock_ro.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int mtdblock_writesect(struct mtd_blktrans_dev *dev, 
{

	size_t retlen;



	if (dev->mtd->write(dev->mtd, (block * 512), 512, &retlen, buf))

	if (mtd_write(dev->mtd, (block * 512), 512, &retlen, buf))

		return 1;

	return 0;

}

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t c 
		}



		default:

			ret = (*(mtd->write))(mtd, *ppos, len, &retlen, kbuf);

			ret = mtd_write(mtd, *ppos, len, &retlen, kbuf);

		}

		if (!ret) {

			*ppos += retlen;