2022-02-23 16:13:02

by Michael Walle

Subject: [PATCH v5 30/32] mtd: spi-nor: spansion: rename vendor specific functions and defines

Drop the generic spi_nor prefix for all the spansion functions.

Signed-off-by: Michael Walle <[email protected]>
Reviewed-by: Pratyush Yadav <[email protected]>
Tested-by: Pratyush Yadav <[email protected]> # on mt35xu512aba, s28hs512t
---
drivers/mtd/spi-nor/spansion.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
index 32d3301ce385..f24e546e04a5 100644
--- a/drivers/mtd/spi-nor/spansion.c
+++ b/drivers/mtd/spi-nor/spansion.c
@@ -309,10 +309,10 @@ static const struct flash_info spansion_nor_parts[] = {
};

/**
- * spi_nor_clear_sr() - Clear the Status Register.
+ * spansion_nor_clear_sr() - Clear the Status Register.
* @nor: pointer to 'struct spi_nor'.
*/
-static void spi_nor_clear_sr(struct spi_nor *nor)
+static void spansion_nor_clear_sr(struct spi_nor *nor)
{
int ret;

@@ -336,13 +336,13 @@ static void spi_nor_clear_sr(struct spi_nor *nor)
}

/**
- * spi_nor_sr_ready_and_clear() - Query the Status Register to see if the flash
- * is ready for new commands and clear it if there are any errors.
+ * spansion_nor_sr_ready_and_clear() - Query the Status Register to see if the
+ * flash is ready for new commands and clear it if there are any errors.
* @nor: pointer to 'struct spi_nor'.
*
* Return: 1 if ready, 0 if not ready, -errno on errors.
*/
-static int spi_nor_sr_ready_and_clear(struct spi_nor *nor)
+static int spansion_nor_sr_ready_and_clear(struct spi_nor *nor)
{
int ret;

@@ -356,7 +356,7 @@ static int spi_nor_sr_ready_and_clear(struct spi_nor *nor)
else
dev_err(nor->dev, "Programming Error occurred\n");

- spi_nor_clear_sr(nor);
+ spansion_nor_clear_sr(nor);

/*
* WEL bit remains set to one when an erase or page program
@@ -384,7 +384,7 @@ static void spansion_nor_late_init(struct spi_nor *nor)
}

if (nor->info->mfr_flags & USE_CLSR)
- nor->params->ready = spi_nor_sr_ready_and_clear;
+ nor->params->ready = spansion_nor_sr_ready_and_clear;
}

static const struct spi_nor_fixups spansion_nor_fixups = {
--
2.30.2

2022-02-25 14:37:32

by Tudor Ambarus

Subject: Re: [PATCH v5 30/32] mtd: spi-nor: spansion: rename vendor specific functions and defines

On 2/23/22 15:43, Michael Walle wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Drop the generic spi_nor prefix for all the spansion functions.
>
> Signed-off-by: Michael Walle <[email protected]>
> Reviewed-by: Pratyush Yadav <[email protected]>
> Tested-by: Pratyush Yadav <[email protected]> # on mt35xu512aba, s28hs512t
> ---
> drivers/mtd/spi-nor/spansion.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
> index 32d3301ce385..f24e546e04a5 100644
> --- a/drivers/mtd/spi-nor/spansion.c
> +++ b/drivers/mtd/spi-nor/spansion.c

you forgot to rename the defines