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

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

mtd: introduce mtd_read interface 



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

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void da850_evm_m25p80_notify_add(struct mtd_info *mtd) 
	size_t retlen;



	if (!strcmp(mtd->name, "MAC-Address")) {

		mtd->read(mtd, 0, ETH_ALEN, &retlen, mac_addr);

		mtd_read(mtd, 0, ETH_ALEN, &retlen, mac_addr);

		if (retlen == ETH_ALEN)

			pr_info("Read MAC addr from SPI Flash: %pM\n",

				mac_addr);

arch/cris/arch-v32/drivers/axisflashmap.c

+2 −2
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ static int __init init_axis_flash(void) 
		} while (blockstat && ptable_sector);

#endif

		if (ptable_sector) {

			main_mtd->read(main_mtd, ptable_sector, PAGESIZE,

				&len, page);

			mtd_read(main_mtd, ptable_sector, PAGESIZE, &len,

				 page);

			ptable_head = &((struct partitiontable *) page)->head;

		}

drivers/mtd/afs.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ afs_read_footer(struct mtd_info *mtd, u_int *img_start, u_int *iis_start, 
	size_t sz;

	int ret;



	ret = mtd->read(mtd, ptr, sizeof(fs), &sz, (u_char *) &fs);

	ret = mtd_read(mtd, ptr, sizeof(fs), &sz, (u_char *)&fs);

	if (ret >= 0 && sz != sizeof(fs))

		ret = -EINVAL;
@@ -132,7 +132,7 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr) 
	int ret, i;



	memset(iis, 0, sizeof(*iis));

	ret = mtd->read(mtd, ptr, sizeof(*iis), &sz, (u_char *) iis);

	ret = mtd_read(mtd, ptr, sizeof(*iis), &sz, (u_char *)iis);

	if (ret < 0)

		goto failed;

drivers/mtd/ar7part.c

+7 −8
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ static int create_mtd_partitions(struct mtd_info *master, 


	do { /* Try 10 blocks starting from master->erasesize */

		offset = pre_size;

		master->read(master, offset,

			     sizeof(header), &len, (uint8_t *)&header);

		mtd_read(master, offset, sizeof(header), &len,

			 (uint8_t *)&header);

		if (!strncmp((char *)&header, "TIENV0.8", 8))

			ar7_parts[1].offset = pre_size;

		if (header.checksum == LOADER_MAGIC1)
@@ -95,16 +95,16 @@ static int create_mtd_partitions(struct mtd_info *master, 
	case LOADER_MAGIC1:

		while (header.length) {

			offset += sizeof(header) + header.length;

			master->read(master, offset, sizeof(header),

				     &len, (uint8_t *)&header);

			mtd_read(master, offset, sizeof(header), &len,

				 (uint8_t *)&header);

		}

		root_offset = offset + sizeof(header) + 4;

		break;

	case LOADER_MAGIC2:

		while (header.length) {

			offset += sizeof(header) + header.length;

			master->read(master, offset, sizeof(header),

				     &len, (uint8_t *)&header);

			mtd_read(master, offset, sizeof(header), &len,

				 (uint8_t *)&header);

		}

		root_offset = offset + sizeof(header) + 4 + 0xff;

		root_offset &= ~(uint32_t)0xff;
@@ -114,8 +114,7 @@ static int create_mtd_partitions(struct mtd_info *master, 
		break;

	}



	master->read(master, root_offset,

		sizeof(header), &len, (u8 *)&header);

	mtd_read(master, root_offset, sizeof(header), &len, (u8 *)&header);

	if (header.checksum != SQUASHFS_MAGIC) {

		root_offset += master->erasesize - 1;

		root_offset &= ~(master->erasesize - 1);

drivers/mtd/bcm63xxpart.c

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int bcm63xx_detect_cfe(struct mtd_info *master) 
	int ret;

	size_t retlen;



	ret = master->read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,

	ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,

		       (void *)buf);

	buf[retlen] = 0;
@@ -59,7 +59,7 @@ static int bcm63xx_detect_cfe(struct mtd_info *master) 
		return 0;



	/* very old CFE's do not have the cfe-v string, so check for magic */

	ret = master->read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,

	ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,

		       (void *)buf);

	buf[retlen] = 0;
@@ -95,7 +95,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, 
		return -ENOMEM;



	/* Get the tag */

	ret = master->read(master, cfelen, sizeof(struct bcm_tag), &retlen,

	ret = mtd_read(master, cfelen, sizeof(struct bcm_tag), &retlen,

		       (void *)buf);



	if (retlen != sizeof(struct bcm_tag)) {