Skip to contentSkip to conversation

net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()

PATCH Applied Kees Cook 2 participants 2 messages May 24, 2019 – May 27, 2019

Subsystems (3)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()

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")
---
 drivers/net/ethernet/dec/tulip/de4x5.c | 1 -
 1 file changed, 1 deletion(-)
drivers/net/ethernet/dec/tulip/de4x5.c +0 -1
index 66535d1653f6..f16853c3c851 100644
@@ -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
Signature · 5 lines
2.17.1


-- 
Kees Cook
maintainer Applied
#1 lore raw

From: Kees Cook <[email protected]>
Date: Fri, 24 May 2019 13:20:19 -0700

Quoted 21 lines

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
^

Quoted 5 lines

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")

Applied.