2019-10-29 11:22:41

by Tudor Ambarus

Subject: [PATCH v3 16/32] mtd: spi-nor: Rename label as it is no longer generic

From: Tudor Ambarus <[email protected]>

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: Tudor Ambarus <[email protected]>
---
drivers/mtd/spi-nor/spi-nor.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 21f01fdcfa16..ed7c233a7208 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2705,7 +2705,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,

ret = spi_nor_write_enable(nor);
if (ret)
- goto sst_write_err;
+ goto out;

nor->sst_write_second = false;

@@ -2716,11 +2716,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
/* write one byte. */
ret = spi_nor_write_data(nor, to, 1, buf);
if (ret < 0)
- goto sst_write_err;
+ goto out;
WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret);
ret = spi_nor_wait_till_ready(nor);
if (ret)
- goto sst_write_err;
+ goto out;

to++;
actual++;
@@ -2733,11 +2733,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
/* write two bytes. */
ret = spi_nor_write_data(nor, to, 2, buf + actual);
if (ret < 0)
- goto sst_write_err;
+ goto out;
WARN(ret != 2, "While writing 2 bytes written %i bytes\n", ret);
ret = spi_nor_wait_till_ready(nor);
if (ret)
- goto sst_write_err;
+ goto out;
to += 2;
nor->sst_write_second = true;
}
@@ -2745,32 +2745,32 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,

ret = spi_nor_write_disable(nor);
if (ret)
- goto sst_write_err;
+ goto out;

ret = spi_nor_wait_till_ready(nor);
if (ret)
- goto sst_write_err;
+ goto out;

/* Write out trailing byte if it exists. */
if (actual != len) {
ret = spi_nor_write_enable(nor);
if (ret)
- goto sst_write_err;
+ goto out;

nor->program_opcode = SPINOR_OP_BP;
ret = spi_nor_write_data(nor, to, 1, buf + actual);
if (ret < 0)
- goto sst_write_err;
+ goto out;
WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret);
ret = spi_nor_wait_till_ready(nor);
if (ret)
- goto sst_write_err;
+ goto out;

actual += 1;

ret = spi_nor_write_disable(nor);
}
-sst_write_err:
+out:
*retlen += actual;
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
--
2.9.5

2019-10-31 11:16:20

by Boris Brezillon

Subject: Re: [PATCH v3 16/32] mtd: spi-nor: Rename label as it is no longer generic

On Tue, 29 Oct 2019 11:17:13 +0000
<[email protected]> wrote:

> From: Tudor Ambarus <[email protected]>
>
> 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: Tudor Ambarus <[email protected]>

Reviewed-by: Boris Brezillon <[email protected]>

> ---
> drivers/mtd/spi-nor/spi-nor.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 21f01fdcfa16..ed7c233a7208 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -2705,7 +2705,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
>
> ret = spi_nor_write_enable(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
>
> nor->sst_write_second = false;
>
> @@ -2716,11 +2716,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
> /* write one byte. */
> ret = spi_nor_write_data(nor, to, 1, buf);
> if (ret < 0)
> - goto sst_write_err;
> + goto out;
> WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret);
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
>
> to++;
> actual++;
> @@ -2733,11 +2733,11 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
> /* write two bytes. */
> ret = spi_nor_write_data(nor, to, 2, buf + actual);
> if (ret < 0)
> - goto sst_write_err;
> + goto out;
> WARN(ret != 2, "While writing 2 bytes written %i bytes\n", ret);
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
> to += 2;
> nor->sst_write_second = true;
> }
> @@ -2745,32 +2745,32 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
>
> ret = spi_nor_write_disable(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
>
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
>
> /* Write out trailing byte if it exists. */
> if (actual != len) {
> ret = spi_nor_write_enable(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
>
> nor->program_opcode = SPINOR_OP_BP;
> ret = spi_nor_write_data(nor, to, 1, buf + actual);
> if (ret < 0)
> - goto sst_write_err;
> + goto out;
> WARN(ret != 1, "While writing 1 byte written %i bytes\n", ret);
> ret = spi_nor_wait_till_ready(nor);
> if (ret)
> - goto sst_write_err;
> + goto out;
>
> actual += 1;
>
> ret = spi_nor_write_disable(nor);
> }
> -sst_write_err:
> +out:
> *retlen += actual;
> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
> return ret;