Commit e8fd3b4b authored by Michael Walle's avatar Michael Walle Committed by Tudor Ambarus
Browse files

mtd: spi-nor: spansion: rename vendor specific functions and defines 



Drop the generic spi_nor prefix for all the spansion functions.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Tested-by: Pratyush Yadav <p.yadav@ti.com> # on mt35xu512aba, s28hs512t
Reviewed-by: default avatarPratyush Yadav <p.yadav@ti.com>
Link: https://lore.kernel.org/r/20220223134358.1914798-31-michael@walle.cc
parent 51c55506

drivers/mtd/spi-nor/spansion.c

+7 −7
Original line number Diff line number Diff line
@@ -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 = {