Messages in this thread Patch in this message | | | From | Michael Walle <> | Subject | [PATCH v1 10/14] mtd: spi-nor: micron-st: rename vendor specific functions and defines | Date | Wed, 2 Feb 2022 15:58:49 +0100 |
| |
Drop the generic spi_nor prefix for all the micron-st functions.
Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/mtd/spi-nor/micron-st.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/spi-nor/micron-st.c b/drivers/mtd/spi-nor/micron-st.c index ca368b48bcb0..988ecbffdc36 100644 --- a/drivers/mtd/spi-nor/micron-st.c +++ b/drivers/mtd/spi-nor/micron-st.c @@ -308,7 +308,7 @@ static int micron_st_set_4byte_addr_mode(struct spi_nor *nor, bool enable) } /** - * spi_nor_read_fsr() - Read the Flag Status Register. + * micron_st_read_fsr() - Read the Flag Status Register. * @nor: pointer to 'struct spi_nor' * @fsr: pointer to a DMA-able buffer where the value of the * Flag Status Register will be written. Should be at least 2 @@ -316,7 +316,7 @@ static int micron_st_set_4byte_addr_mode(struct spi_nor *nor, bool enable) * * Return: 0 on success, -errno otherwise. */ -static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) +static int micron_st_read_fsr(struct spi_nor *nor, u8 *fsr) { int ret; @@ -352,10 +352,10 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) } /** - * spi_nor_clear_fsr() - Clear the Flag Status Register. + * micron_st_clear_fsr() - Clear the Flag Status Register. * @nor: pointer to 'struct spi_nor'. */ -static void spi_nor_clear_fsr(struct spi_nor *nor) +static void micron_st_clear_fsr(struct spi_nor *nor) { int ret; @@ -379,13 +379,13 @@ static void spi_nor_clear_fsr(struct spi_nor *nor) } /** - * spi_nor_fsr_ready() - Query the Flag Status Register to see if the flash is + * micron_st_fsr_ready() - Query the Flag Status Register to see if the flash is * ready for new commands. * @nor: pointer to 'struct spi_nor'. * * Return: 1 if ready, 0 if not ready, -errno on errors. */ -static int spi_nor_fsr_ready(struct spi_nor *nor) +static int micron_st_fsr_ready(struct spi_nor *nor) { int sr_ready, ret; @@ -393,7 +393,7 @@ static int spi_nor_fsr_ready(struct spi_nor *nor) if (sr_ready < 0) return sr_ready; - ret = spi_nor_read_fsr(nor, nor->bouncebuf); + ret = micron_st_read_fsr(nor, nor->bouncebuf); if (ret) return ret; @@ -407,7 +407,7 @@ static int spi_nor_fsr_ready(struct spi_nor *nor) dev_err(nor->dev, "Attempted to modify a protected sector.\n"); - spi_nor_clear_fsr(nor); + micron_st_clear_fsr(nor); /* * WEL bit remains set to one when an erase or page program @@ -433,7 +433,7 @@ static void micron_st_default_init(struct spi_nor *nor) nor->params->set_4byte_addr_mode = micron_st_set_4byte_addr_mode; if (nor->info->mfr_flags & USE_FSR) - nor->params->ready = spi_nor_fsr_ready; + nor->params->ready = micron_st_fsr_ready; } static const struct spi_nor_fixups micron_st_fixups = { -- 2.30.2
| |