Commit a30144c0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Miquel Raynal
Browse files

mtd: dataflash: remove duplicate SPI ID table 



Building with -Werror=override-init reveals that two patches added
the same device ID table to this driver:

drivers/mtd/devices/mtd_dataflash.c:946:27: error: initialized field overwritten [-Werror=override-init]
  946 |         .id_table       = dataflash_spi_ids,
      |                           ^~~~~~~~~~~~~~~~~
drivers/mtd/devices/mtd_dataflash.c:946:27: note: (near initialization for 'dataflash_driver.id_table')

Remove one of the copies.

Fixes: 27a030e8 ("mtd: dataflash: Add device-tree SPI IDs")
Fixes: ac4f8348 ("mtd: dataflash: Add SPI ID table")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20221215164736.1315815-1-arnd@kernel.org
parent 1b929c02

drivers/mtd/devices/mtd_dataflash.c

+0 −9
Original line number Diff line number Diff line
@@ -96,13 +96,6 @@ struct dataflash { 
	struct mtd_info		mtd;

};



static const struct spi_device_id dataflash_dev_ids[] = {

	{ "at45" },

	{ "dataflash" },

	{ },

};

MODULE_DEVICE_TABLE(spi, dataflash_dev_ids);



#ifdef CONFIG_OF

static const struct of_device_id dataflash_dt_ids[] = {

	{ .compatible = "atmel,at45", },
@@ -939,8 +932,6 @@ static struct spi_driver dataflash_driver = { 
		.name		= "mtd_dataflash",

		.of_match_table = of_match_ptr(dataflash_dt_ids),

	},

	.id_table = dataflash_dev_ids,



	.probe		= dataflash_probe,

	.remove		= dataflash_remove,

	.id_table	= dataflash_spi_ids,