Unverified Commit c4fdfdc1 authored by Boris Brezillon's avatar Boris Brezillon Committed by Tudor Ambarus
Browse files

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: default avatarBoris Brezillon <bbrezillon@kernel.org>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent a674d5a6

drivers/mtd/spi-nor/core.c

+0 −25
Original line number Diff line number Diff line
@@ -1931,21 +1931,6 @@ int spi_nor_sr2_bit7_quad_enable(struct spi_nor *nor) 
	return 0;

}



/* NOTE: double check command sets and memory organization when you add

 * more nor chips.  This current list focusses on newer chips, which

 * have been converging on command sets which including JEDEC ID.

 *

 * All newly added entries should describe *hardware* and should use SECT_4K

 * (or SECT_4K_PMC) if hardware supports erasing 4 KiB sectors. For usage

 * scenarios excluding small sectors there is config option that can be

 * disabled: CONFIG_MTD_SPI_NOR_USE_4K_SECTORS.

 * For historical (and compatibility) reasons (before we got above config) some

 * old entries may be missing 4K flag.

 */

static const struct flash_info spi_nor_ids[] = {

	{ },

};



static const struct spi_nor_manufacturer *manufacturers[] = {

	&spi_nor_atmel,

	&spi_nor_catalyst,
@@ -2015,11 +2000,6 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor) 
		}

	}



	info = spi_nor_search_part_by_id(spi_nor_ids,

					 ARRAY_SIZE(spi_nor_ids) - 1, id);

	if (info)

		return info;



	dev_err(nor->dev, "unrecognized JEDEC id bytes: %*ph\n",

		SPI_NOR_MAX_ID_LEN, id);

	return ERR_PTR(-ENODEV);
@@ -2930,11 +2910,6 @@ static const struct flash_info *spi_nor_match_id(struct spi_nor *nor, 
{

	unsigned int i, j;



	for (i = 0; i < ARRAY_SIZE(spi_nor_ids) - 1; i++) {

		if (!strcmp(name, spi_nor_ids[i].name))

			return &spi_nor_ids[i];

	}



	for (i = 0; i < ARRAY_SIZE(manufacturers); i++) {

		for (j = 0; j < manufacturers[i]->nparts; j++) {

			if (!strcmp(name, manufacturers[i]->parts[j].name)) {