|
Takashi Iwai |
d94973 |
From f42752729e2068a92c7d8b576d0dbbc9c1464149 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
d94973 |
From: Arnd Bergmann <arnd@arndb.de>
|
|
Takashi Iwai |
d94973 |
Date: Thu, 14 Oct 2021 17:37:18 +0200
|
|
Takashi Iwai |
d94973 |
Subject: [PATCH] eeprom: 93xx46: fix MODULE_DEVICE_TABLE
|
|
Takashi Iwai |
d94973 |
Git-commit: f42752729e2068a92c7d8b576d0dbbc9c1464149
|
|
Takashi Iwai |
d94973 |
Patch-mainline: v5.15-rc6
|
|
Takashi Iwai |
c50dd6 |
References: git-fixes stable-5.14.14
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
The newly added SPI device ID table does not work because the
|
|
Takashi Iwai |
d94973 |
entry is incorrectly copied from the OF device table.
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
During build testing, this shows as a compile failure when building
|
|
Takashi Iwai |
d94973 |
it as a loadable module:
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
drivers/misc/eeprom/eeprom_93xx46.c:424:1: error: redefinition of '__mod_of__eeprom_93xx46_of_table_device_table'
|
|
Takashi Iwai |
d94973 |
MODULE_DEVICE_TABLE(of, eeprom_93xx46_of_table);
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
Change the entry to refer to the correct symbol.
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
Fixes: 137879f7ff23 ("eeprom: 93xx46: Add SPI device ID table")
|
|
Takashi Iwai |
d94973 |
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Takashi Iwai |
d94973 |
Link: https://lore.kernel.org/r/20211014153730.3821376-1-arnd@kernel.org
|
|
Takashi Iwai |
d94973 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
d94973 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
---
|
|
Takashi Iwai |
d94973 |
drivers/misc/eeprom/eeprom_93xx46.c | 2 +-
|
|
Takashi Iwai |
d94973 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
|
|
Takashi Iwai |
d94973 |
index 660ee924f8b1..1f15399e5cb4 100644
|
|
Takashi Iwai |
d94973 |
--- a/drivers/misc/eeprom/eeprom_93xx46.c
|
|
Takashi Iwai |
d94973 |
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
|
|
Takashi Iwai |
d94973 |
@@ -421,7 +421,7 @@ static const struct spi_device_id eeprom_93xx46_spi_ids[] = {
|
|
Takashi Iwai |
d94973 |
.driver_data = (kernel_ulong_t)µchip_93lc46b_data, },
|
|
Takashi Iwai |
d94973 |
{}
|
|
Takashi Iwai |
d94973 |
};
|
|
Takashi Iwai |
d94973 |
-MODULE_DEVICE_TABLE(of, eeprom_93xx46_of_table);
|
|
Takashi Iwai |
d94973 |
+MODULE_DEVICE_TABLE(spi, eeprom_93xx46_spi_ids);
|
|
Takashi Iwai |
d94973 |
|
|
Takashi Iwai |
d94973 |
static int eeprom_93xx46_probe_dt(struct spi_device *spi)
|
|
Takashi Iwai |
d94973 |
{
|
|
Takashi Iwai |
d94973 |
--
|
|
Takashi Iwai |
d94973 |
2.26.2
|
|
Takashi Iwai |
d94973 |
|