Commit cd1ebe1c authored by Tudor Ambarus's avatar Tudor Ambarus

mtd: spi-nor: Rename label as it is no longer generic

Rename 'sst_write_err' label to 'out' as it is no longer generic for
all the errors in the sst_write() method, and may introduce confusion.
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
parent bce679e5
...@@ -2709,7 +2709,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -2709,7 +2709,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
ret = spi_nor_write_enable(nor); ret = spi_nor_write_enable(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
nor->sst_write_second = false; nor->sst_write_second = false;
...@@ -2720,11 +2720,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -2720,11 +2720,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
/* write one byte. */ /* write one byte. */
ret = spi_nor_write_data(nor, to, 1, buf); ret = spi_nor_write_data(nor, to, 1, buf);
if (ret < 0) if (ret < 0)
goto sst_write_err; goto out;
WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret); WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret);
ret = spi_nor_wait_till_ready(nor); ret = spi_nor_wait_till_ready(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
to++; to++;
actual++; actual++;
...@@ -2737,11 +2737,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -2737,11 +2737,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
/* write two bytes. */ /* write two bytes. */
ret = spi_nor_write_data(nor, to, 2, buf + actual); ret = spi_nor_write_data(nor, to, 2, buf + actual);
if (ret < 0) if (ret < 0)
goto sst_write_err; goto out;
WARN(ret != 2, "While writing 2 bytes written %i bytes\n", ret); WARN(ret != 2, "While writing 2 bytes written %i bytes\n", ret);
ret = spi_nor_wait_till_ready(nor); ret = spi_nor_wait_till_ready(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
to += 2; to += 2;
nor->sst_write_second = true; nor->sst_write_second = true;
} }
...@@ -2749,32 +2749,32 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -2749,32 +2749,32 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
ret = spi_nor_write_disable(nor); ret = spi_nor_write_disable(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
ret = spi_nor_wait_till_ready(nor); ret = spi_nor_wait_till_ready(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
/* Write out trailing byte if it exists. */ /* Write out trailing byte if it exists. */
if (actual != len) { if (actual != len) {
ret = spi_nor_write_enable(nor); ret = spi_nor_write_enable(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
nor->program_opcode = SPINOR_OP_BP; nor->program_opcode = SPINOR_OP_BP;
ret = spi_nor_write_data(nor, to, 1, buf + actual); ret = spi_nor_write_data(nor, to, 1, buf + actual);
if (ret < 0) if (ret < 0)
goto sst_write_err; goto out;
WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret); WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret);
ret = spi_nor_wait_till_ready(nor); ret = spi_nor_wait_till_ready(nor);
if (ret) if (ret)
goto sst_write_err; goto out;
actual += 1; actual += 1;
ret = spi_nor_write_disable(nor); ret = spi_nor_write_disable(nor);
} }
sst_write_err: out:
*retlen += actual; *retlen += actual;
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment