Skip to content

Commit e8fd3b4

Browse files
mwalleambarus
authored andcommitted
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 <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-31-michael@walle.cc
1 parent 51c5550 commit e8fd3b4

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/mtd/spi-nor/spansion.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ static const struct flash_info spansion_nor_parts[] = {
309309
};
310310

311311
/**
312-
* spi_nor_clear_sr() - Clear the Status Register.
312+
* spansion_nor_clear_sr() - Clear the Status Register.
313313
* @nor: pointer to 'struct spi_nor'.
314314
*/
315-
static void spi_nor_clear_sr(struct spi_nor *nor)
315+
static void spansion_nor_clear_sr(struct spi_nor *nor)
316316
{
317317
int ret;
318318

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

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

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

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

361361
/*
362362
* 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)
384384
}
385385

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

390390
static const struct spi_nor_fixups spansion_nor_fixups = {

0 commit comments

Comments
 (0)