[PATCH] net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()

[PATCH] net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()

[Kees Cook]

Building with Clang reports the redundant use of MODULE_DEVICE_TABLE():

drivers/net/ethernet/dec/tulip/de4x5.c:2110:1: error: redefinition of '__mod_eisa__de4x5_eisa_ids_device_table'
MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
^
./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
extern typeof(name) __mod_##type##__##name##_device_table               \
                    ^
<scratch space>:90:1: note: expanded from here
__mod_eisa__de4x5_eisa_ids_device_table
^
drivers/net/ethernet/dec/tulip/de4x5.c:2100:1: note: previous definition is here
MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
^
./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
extern typeof(name) __mod_##type##__##name##_device_table               \
                    ^
<scratch space>:85:1: note: expanded from here
__mod_eisa__de4x5_eisa_ids_device_table
^

This drops the one further from the table definition to match the common
use of MODULE_DEVICE_TABLE().

Fixes: 07563c711fbc ("EISA bus MODALIAS attributes support")
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/net/ethernet/dec/tulip/de4x5.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 66535d1653f6..f16853c3c851 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -2107,7 +2107,6 @@ static struct eisa_driver de4x5_eisa_driver = {
 		.remove  = de4x5_eisa_remove,
         }
 };
-MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
 #endif
 
 #ifdef CONFIG_PCI
-- 
2.17.1


-- 
Kees Cook

Re: [PATCH] net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()

[David Miller]

From: Kees Cook <keescook@chromium.org>
Date: Fri, 24 May 2019 13:20:19 -0700

> Building with Clang reports the redundant use of MODULE_DEVICE_TABLE():
> 
> drivers/net/ethernet/dec/tulip/de4x5.c:2110:1: error: redefinition of '__mod_eisa__de4x5_eisa_ids_device_table'
> MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
> ^
> ./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
> extern typeof(name) __mod_##type##__##name##_device_table               \
>                     ^
> <scratch space>:90:1: note: expanded from here
> __mod_eisa__de4x5_eisa_ids_device_table
> ^
> drivers/net/ethernet/dec/tulip/de4x5.c:2100:1: note: previous definition is here
> MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
> ^
> ./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
> extern typeof(name) __mod_##type##__##name##_device_table               \
>                     ^
> <scratch space>:85:1: note: expanded from here
> __mod_eisa__de4x5_eisa_ids_device_table
> ^
> 
> This drops the one further from the table definition to match the common
> use of MODULE_DEVICE_TABLE().
> 
> Fixes: 07563c711fbc ("EISA bus MODALIAS attributes support")
> Signed-off-by: Kees Cook <keescook@chromium.org>

Applied.