Skip to content

Commit c4fdfdc

Browse files
bbrezillonambarus
authored andcommitted
mtd: spi-nor: Get rid of the now empty spi_nor_ids[] table
All entries have been moved to manufacturer drivers. Get rid of this empty table. Signed-off-by: Boris Brezillon <[email protected]> Signed-off-by: Tudor Ambarus <[email protected]> Reviewed-by: Vignesh Raghavendra <[email protected]>
1 parent a674d5a commit c4fdfdc

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

drivers/mtd/spi-nor/core.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,21 +1931,6 @@ int spi_nor_sr2_bit7_quad_enable(struct spi_nor *nor)
19311931
return 0;
19321932
}
19331933

1934-
/* NOTE: double check command sets and memory organization when you add
1935-
* more nor chips. This current list focusses on newer chips, which
1936-
* have been converging on command sets which including JEDEC ID.
1937-
*
1938-
* All newly added entries should describe *hardware* and should use SECT_4K
1939-
* (or SECT_4K_PMC) if hardware supports erasing 4 KiB sectors. For usage
1940-
* scenarios excluding small sectors there is config option that can be
1941-
* disabled: CONFIG_MTD_SPI_NOR_USE_4K_SECTORS.
1942-
* For historical (and compatibility) reasons (before we got above config) some
1943-
* old entries may be missing 4K flag.
1944-
*/
1945-
static const struct flash_info spi_nor_ids[] = {
1946-
{ },
1947-
};
1948-
19491934
static const struct spi_nor_manufacturer *manufacturers[] = {
19501935
&spi_nor_atmel,
19511936
&spi_nor_catalyst,
@@ -2015,11 +2000,6 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
20152000
}
20162001
}
20172002

2018-
info = spi_nor_search_part_by_id(spi_nor_ids,
2019-
ARRAY_SIZE(spi_nor_ids) - 1, id);
2020-
if (info)
2021-
return info;
2022-
20232003
dev_err(nor->dev, "unrecognized JEDEC id bytes: %*ph\n",
20242004
SPI_NOR_MAX_ID_LEN, id);
20252005
return ERR_PTR(-ENODEV);
@@ -2930,11 +2910,6 @@ static const struct flash_info *spi_nor_match_id(struct spi_nor *nor,
29302910
{
29312911
unsigned int i, j;
29322912

2933-
for (i = 0; i < ARRAY_SIZE(spi_nor_ids) - 1; i++) {
2934-
if (!strcmp(name, spi_nor_ids[i].name))
2935-
return &spi_nor_ids[i];
2936-
}
2937-
29382913
for (i = 0; i < ARRAY_SIZE(manufacturers); i++) {
29392914
for (j = 0; j < manufacturers[i]->nparts; j++) {
29402915
if (!strcmp(name, manufacturers[i]->parts[j].name)) {

0 commit comments

Comments
 (0)