Message ID | 20221215164736.1315815-1-arnd@kernel.org |
---|---|
State | Accepted |
Headers | show |
Series | mtd: dataflash: remove duplicate SPI ID table | expand |
On Thu, Dec 15, 2022 at 05:47:30PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Building with -Werror=override-init revealds that two patches added s/revealds/reveals/ > 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: 27a030e87292 ("mtd: dataflash: Add device-tree SPI IDs") > Fixes: ac4f83482afb ("mtd: dataflash: Add SPI ID table") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> I seem to recall this was addressed already before. I found https://lore.kernel.org/r/20221004211412.182940-1-colin.i.king@gmail.com but it seems Colin (added to Cc:) never followed up on the build problems reported by the build bots. Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe
On Thu, 2022-12-15 at 16:47:30 UTC, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Building with -Werror=override-init revealds 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: 27a030e87292 ("mtd: dataflash: Add device-tree SPI IDs") > Fixes: ac4f83482afb ("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> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 25bad4318305..3bbaa590c768 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -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,