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

mtd: spi-nor: macronix: unify function names 



To avoid name clashes unify all the function and static object names and
use one of the following prefixes which should be sufficiently unique:
 - <vendor>_nor_
 - <flash_family>_nor_
 - <flash_part>_

There are no functional changes.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: default avatarPratyush Yadav <p.yadav@ti.com>
Link: https://lore.kernel.org/r/20220223134358.1914798-11-michael@walle.cc
parent cc5af02f

drivers/mtd/spi-nor/macronix.c

+7 −7
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static const struct spi_nor_fixups mx25l25635_fixups = { 
	.post_bfpt = mx25l25635_post_bfpt_fixups,

};



static const struct flash_info macronix_parts[] = {

static const struct flash_info macronix_nor_parts[] = {

	/* Macronix */

	{ "mx25l512e",   INFO(0xc22010, 0, 64 * 1024,   1)

		NO_SFDP_FLAGS(SECT_4K) },
@@ -102,19 +102,19 @@ static const struct flash_info macronix_parts[] = { 
		FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },

};



static void macronix_default_init(struct spi_nor *nor)

static void macronix_nor_default_init(struct spi_nor *nor)

{

	nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;

	nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode;

}



static const struct spi_nor_fixups macronix_fixups = {

	.default_init = macronix_default_init,

static const struct spi_nor_fixups macronix_nor_fixups = {

	.default_init = macronix_nor_default_init,

};



const struct spi_nor_manufacturer spi_nor_macronix = {

	.name = "macronix",

	.parts = macronix_parts,

	.nparts = ARRAY_SIZE(macronix_parts),

	.fixups = &macronix_fixups,

	.parts = macronix_nor_parts,

	.nparts = ARRAY_SIZE(macronix_nor_parts),

	.fixups = &macronix_nor_fixups,

};