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

Commit bc418cd2 authored by Brian Norris's avatar Brian Norris
Browse files

mtd: nxp-spifi: return amount of data transferred or error in read/write 



Add checking of SPI transfer errors and return them from read/write
functions. Also return the amount of data transferred.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 78b400fd

drivers/mtd/spi-nor/nxp-spifi.c

+9 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static ssize_t nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len, 
	memcpy_fromio(buf, spifi->flash_base + from, len);

	*retlen += len;



	return 0;

	return len;

}



static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
@@ -194,6 +194,7 @@ static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len, 
	struct nxp_spifi *spifi = nor->priv;

	u32 cmd;

	int ret;

	size_t i;



	ret = nxp_spifi_set_memory_mode_off(spifi);

	if (ret)
@@ -209,10 +210,14 @@ static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len, 
	      SPIFI_CMD_FRAMEFORM(spifi->nor.addr_width + 1);

	writel(cmd, spifi->io_base + SPIFI_CMD);



	while (len--)

		writeb(*buf++, spifi->io_base + SPIFI_DATA);

	for (i = 0; i < len; i++)

		writeb(buf[i], spifi->io_base + SPIFI_DATA);



	return nxp_spifi_wait_for_cmd(spifi);

	ret = nxp_spifi_wait_for_cmd(spifi);

	if (ret)

		return ret;



	return len;

}



static int nxp_spifi_erase(struct spi_nor *nor, loff_t offs)