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

mtd: spi-nor: xilinx: 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-16-michael@walle.cc
parent a7a0466f

drivers/mtd/spi-nor/xilinx.c

+9 −9
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include "core.h"



static const struct flash_info xilinx_parts[] = {

static const struct flash_info xilinx_nor_parts[] = {

	/* Xilinx S3AN Internal Flash */

	{ "3S50AN", S3AN_INFO(0x1f2200, 64, 264) },

	{ "3S200AN", S3AN_INFO(0x1f2400, 256, 264) },
@@ -26,7 +26,7 @@ static const struct flash_info xilinx_parts[] = { 
 * Addr can safely be unsigned int, the biggest S3AN device is smaller than

 * 4 MiB.

 */

static u32 s3an_convert_addr(struct spi_nor *nor, u32 addr)

static u32 s3an_nor_convert_addr(struct spi_nor *nor, u32 addr)

{

	u32 page_size = nor->params->page_size;

	u32 offset, page;
@@ -73,25 +73,25 @@ static int xilinx_nor_setup(struct spi_nor *nor, 
		nor->mtd.erasesize = 8 * page_size;

	} else {

		/* Flash in Default addressing mode */

		nor->params->convert_addr = s3an_convert_addr;

		nor->params->convert_addr = s3an_nor_convert_addr;

		nor->mtd.erasesize = nor->info->sector_size;

	}



	return 0;

}



static void xilinx_late_init(struct spi_nor *nor)

static void xilinx_nor_late_init(struct spi_nor *nor)

{

	nor->params->setup = xilinx_nor_setup;

}



static const struct spi_nor_fixups xilinx_fixups = {

	.late_init = xilinx_late_init,

static const struct spi_nor_fixups xilinx_nor_fixups = {

	.late_init = xilinx_nor_late_init,

};



const struct spi_nor_manufacturer spi_nor_xilinx = {

	.name = "xilinx",

	.parts = xilinx_parts,

	.nparts = ARRAY_SIZE(xilinx_parts),

	.fixups = &xilinx_fixups,

	.parts = xilinx_nor_parts,

	.nparts = ARRAY_SIZE(xilinx_nor_parts),

	.fixups = &xilinx_nor_fixups,

};