mtd: spi-nor: sst: 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: Michael Walle <michael@walle.cc> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Acked-by: Pratyush Yadav <p.yadav@ti.com> Link: https://lore.kernel.org/r/20220223134358.1914798-14-michael@walle.cc
This commit is contained in:
Родитель
fedd0cbf3e
Коммит
7e5b38ae4f
|
@ -13,12 +13,12 @@
|
|||
|
||||
#define SST26VF_CR_BPNV BIT(3)
|
||||
|
||||
static int sst26vf_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
static int sst26vf_nor_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int sst26vf_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
static int sst26vf_nor_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -38,27 +38,27 @@ static int sst26vf_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
|||
return spi_nor_global_block_unlock(nor);
|
||||
}
|
||||
|
||||
static int sst26vf_is_locked(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
static int sst26vf_nor_is_locked(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static const struct spi_nor_locking_ops sst26vf_locking_ops = {
|
||||
.lock = sst26vf_lock,
|
||||
.unlock = sst26vf_unlock,
|
||||
.is_locked = sst26vf_is_locked,
|
||||
static const struct spi_nor_locking_ops sst26vf_nor_locking_ops = {
|
||||
.lock = sst26vf_nor_lock,
|
||||
.unlock = sst26vf_nor_unlock,
|
||||
.is_locked = sst26vf_nor_is_locked,
|
||||
};
|
||||
|
||||
static void sst26vf_late_init(struct spi_nor *nor)
|
||||
static void sst26vf_nor_late_init(struct spi_nor *nor)
|
||||
{
|
||||
nor->params->locking_ops = &sst26vf_locking_ops;
|
||||
nor->params->locking_ops = &sst26vf_nor_locking_ops;
|
||||
}
|
||||
|
||||
static const struct spi_nor_fixups sst26vf_fixups = {
|
||||
.late_init = sst26vf_late_init,
|
||||
static const struct spi_nor_fixups sst26vf_nor_fixups = {
|
||||
.late_init = sst26vf_nor_late_init,
|
||||
};
|
||||
|
||||
static const struct flash_info sst_parts[] = {
|
||||
static const struct flash_info sst_nor_parts[] = {
|
||||
/* SST -- large erase sizes are "overlays", "sectors" are 4K */
|
||||
{ "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
|
@ -114,11 +114,11 @@ static const struct flash_info sst_parts[] = {
|
|||
{ "sst26vf064b", INFO(0xbf2643, 0, 64 * 1024, 128)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
|
||||
.fixups = &sst26vf_fixups },
|
||||
.fixups = &sst26vf_nor_fixups },
|
||||
};
|
||||
|
||||
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
size_t *retlen, const u_char *buf)
|
||||
static int sst_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
size_t *retlen, const u_char *buf)
|
||||
{
|
||||
struct spi_nor *nor = mtd_to_spi_nor(mtd);
|
||||
size_t actual = 0;
|
||||
|
@ -203,19 +203,19 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void sst_late_init(struct spi_nor *nor)
|
||||
static void sst_nor_late_init(struct spi_nor *nor)
|
||||
{
|
||||
if (nor->info->mfr_flags & SST_WRITE)
|
||||
nor->mtd._write = sst_write;
|
||||
nor->mtd._write = sst_nor_write;
|
||||
}
|
||||
|
||||
static const struct spi_nor_fixups sst_fixups = {
|
||||
.late_init = sst_late_init,
|
||||
static const struct spi_nor_fixups sst_nor_fixups = {
|
||||
.late_init = sst_nor_late_init,
|
||||
};
|
||||
|
||||
const struct spi_nor_manufacturer spi_nor_sst = {
|
||||
.name = "sst",
|
||||
.parts = sst_parts,
|
||||
.nparts = ARRAY_SIZE(sst_parts),
|
||||
.fixups = &sst_fixups,
|
||||
.parts = sst_nor_parts,
|
||||
.nparts = ARRAY_SIZE(sst_nor_parts),
|
||||
.fixups = &sst_nor_fixups,
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче