mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

mtd: dataflash: remove duplicate SPI ID table

Browse source 
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: 27a030e872 ("mtd: dataflash: Add device-tree SPI IDs")
Fixes: ac4f83482a ("mtd: dataflash: Add SPI ID table")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20221215164736.1315815-1-arnd@kernel.org
This commit is contained in:
Arnd Bergmann 2022-12-15 17:47:30 +01:00 committed by Miquel Raynal
parent 1b929c02af
commit a30144c02c
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/mtd/devices/mtd_dataflash.c
View file

@ -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,