1 From 56c349fba7b4055023a704e5869607912de2bca9 Mon Sep 17 00:00:00 2001
2 From: Kees Cook <keescook@chromium.org>
3 Date: Fri, 24 May 2019 13:20:19 -0700
4 Subject: net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()
6 [ Upstream commit 3e66b7cc50ef921121babc91487e1fb98af1ba6e ]
8 Building with Clang reports the redundant use of MODULE_DEVICE_TABLE():
10 drivers/net/ethernet/dec/tulip/de4x5.c:2110:1: error: redefinition of '__mod_eisa__de4x5_eisa_ids_device_table'
11 MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
13 ./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
14 extern typeof(name) __mod_##type##__##name##_device_table \
16 <scratch space>:90:1: note: expanded from here
17 __mod_eisa__de4x5_eisa_ids_device_table
19 drivers/net/ethernet/dec/tulip/de4x5.c:2100:1: note: previous definition is here
20 MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
22 ./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
23 extern typeof(name) __mod_##type##__##name##_device_table \
25 <scratch space>:85:1: note: expanded from here
26 __mod_eisa__de4x5_eisa_ids_device_table
29 This drops the one further from the table definition to match the common
30 use of MODULE_DEVICE_TABLE().
32 Fixes: 07563c711fbc ("EISA bus MODALIAS attributes support")
33 Signed-off-by: Kees Cook <keescook@chromium.org>
34 Signed-off-by: David S. Miller <davem@davemloft.net>
35 Signed-off-by: Sasha Levin <sashal@kernel.org>
37 drivers/net/ethernet/dec/tulip/de4x5.c | 1 -
38 1 file changed, 1 deletion(-)
40 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
41 index 0affee9c8aa2..0b1e7a96ff49 100644
42 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
43 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
44 @@ -2108,7 +2108,6 @@ static struct eisa_driver de4x5_eisa_driver = {
45 .remove = de4x5_eisa_remove,
48 -MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);