| From: Kees Cook <keescook@chromium.org> |
| Date: Fri, 24 May 2019 13:20:19 -0700 |
| Subject: net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE() |
| |
| commit 3e66b7cc50ef921121babc91487e1fb98af1ba6e upstream. |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/ethernet/dec/tulip/de4x5.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- 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_dri |
| .remove = de4x5_eisa_remove, |
| } |
| }; |
| -MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); |
| #endif |
| |
| #ifdef CONFIG_PCI |
