mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
mtd: spi-nor: micron-st: rename vendor specific functions and defines
Drop the generic spi_nor prefix for all the micron-st functions. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Tested-by: Pratyush Yadav <p.yadav@ti.com> # on mt35xu512aba, s28hs512t Reviewed-by: Pratyush Yadav <p.yadav@ti.com> Link: https://lore.kernel.org/r/20220223134358.1914798-27-michael@walle.cc
This commit is contained in:
parent
8f938262a6
commit
2b18a18ea7
1 changed files with 9 additions and 9 deletions
|
@ -309,7 +309,7 @@ static int micron_st_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable)
|
|||
}
|
||||
|
||||
/**
|
||||
* spi_nor_read_fsr() - Read the Flag Status Register.
|
||||
* micron_st_nor_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
|
||||
|
@ -317,7 +317,7 @@ static int micron_st_nor_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_nor_read_fsr(struct spi_nor *nor, u8 *fsr)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -353,10 +353,10 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)
|
|||
}
|
||||
|
||||
/**
|
||||
* spi_nor_clear_fsr() - Clear the Flag Status Register.
|
||||
* micron_st_nor_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_nor_clear_fsr(struct spi_nor *nor)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -380,14 +380,14 @@ static void spi_nor_clear_fsr(struct spi_nor *nor)
|
|||
}
|
||||
|
||||
/**
|
||||
* spi_nor_fsr_ready() - Query the Status Register as well as the Flag Status
|
||||
* micron_st_nor_ready() - Query the Status Register as well as the Flag Status
|
||||
* Register to see if the flash is ready for new commands. If there are any
|
||||
* errors in the FSR clear them.
|
||||
* @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_nor_ready(struct spi_nor *nor)
|
||||
{
|
||||
int sr_ready, ret;
|
||||
|
||||
|
@ -395,7 +395,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_nor_read_fsr(nor, nor->bouncebuf);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -409,7 +409,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_nor_clear_fsr(nor);
|
||||
|
||||
/*
|
||||
* WEL bit remains set to one when an erase or page program
|
||||
|
@ -438,7 +438,7 @@ static void micron_st_nor_default_init(struct spi_nor *nor)
|
|||
static void micron_st_nor_late_init(struct spi_nor *nor)
|
||||
{
|
||||
if (nor->info->mfr_flags & USE_FSR)
|
||||
nor->params->ready = spi_nor_fsr_ready;
|
||||
nor->params->ready = micron_st_nor_ready;
|
||||
}
|
||||
|
||||
static const struct spi_nor_fixups micron_st_nor_fixups = {
|
||||
|
|
Loading…
Reference in a new issue