treewide: Remove unnecessary BCMA_CORETABLE_END macro
Subsystems (8)
PATCH 1/1 treewide: Remove unnecessary BCMA_CORETABLE_END macro
Use the normal {} instead of a macro to terminate an array.
Remove the macro too.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 2 +- drivers/spi/spi-bcm53xx.c | 2 +- drivers/usb/host/bcma-hcd.c | 2 +- include/linux/mod_devicetable.h | 2 -- 6 files changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +1 -1
@@ -21,7 +21,7 @@static const struct bcma_device_id bgmac_bcma_tbl[] = {BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_4706_MAC_GBIT ,BCMA_ANY_REV ,BCMA_ANY_CLASS ),BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_MAC_GBIT ,BCMA_ANY_REV ,BCMA_ANY_CLASS ), -BCMA_CORETABLE_END + {}, };MODULE_DEVICE_TABLE (bcma, bgmac_bcma_tbl);
drivers/net/wireless/b43/main.c +1 -1
@@ -127,7 +127,7 @@ static const struct bcma_device_id b43_bcma_tbl[] = {BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_80211 ,0x1E ,BCMA_ANY_CLASS ),BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_80211 ,0x28 ,BCMA_ANY_CLASS ),BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_80211 ,0x2A ,BCMA_ANY_CLASS ), -BCMA_CORETABLE_END + {}, };MODULE_DEVICE_TABLE (bcma, b43_bcma_tbl);#endif
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +1 -1
@@ -99,7 +99,7 @@ static struct bcma_device_id brcms_coreid_table[] = {BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_80211 ,17 ,BCMA_ANY_CLASS ),BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_80211 ,23 ,BCMA_ANY_CLASS ),BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_80211 ,24 ,BCMA_ANY_CLASS ), - BCMA_CORETABLE_END + {}, };MODULE_DEVICE_TABLE (bcma, brcms_coreid_table);
drivers/spi/spi-bcm53xx.c +1 -1
@@ -216,7 +216,7 @@ static struct spi_board_info bcm53xx_info = {static const struct bcma_device_id bcm53xxspi_bcma_tbl[] = {BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_NS_QSPI ,BCMA_ANY_REV ,BCMA_ANY_CLASS ), -BCMA_CORETABLE_END + {}, };MODULE_DEVICE_TABLE (bcma, bcm53xxspi_bcma_tbl);
drivers/usb/host/bcma-hcd.c +1 -1
@@ -306,7 +306,7 @@ static int bcma_hcd_resume(struct bcma_device *dev)static const struct bcma_device_id bcma_hcd_table[] = {BCMA_CORE (BCMA_MANUF_BCM ,BCMA_CORE_USB20_HOST ,BCMA_ANY_REV ,BCMA_ANY_CLASS ), -BCMA_CORETABLE_END + {}, };MODULE_DEVICE_TABLE (bcma, bcma_hcd_table);
include/linux/mod_devicetable.h +0 -2
@@ -380,8 +380,6 @@ struct bcma_device_id { } __attribute__((packed,aligned(2)));#define BCMA_CORE (_manuf, _id, _rev, _class) \ { .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, } -#define BCMA_CORETABLE_END \ - { 0, },#define BCMA_ANY_MANUF 0xFFFF#define BCMA_ANY_ID 0xFFFF
PATCH 1/1 treewide: Remove unnecessary SSB_DEVTABLE_END macro
Use the normal {} instead of a macro to terminate an array.
Remove the macro too.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/ethernet/broadcom/b44.c | 2 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/ssb/driver_gige.c | 2 +- drivers/usb/host/ssb-hcd.c | 2 +- include/linux/mod_devicetable.h | 2 -- 6 files changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/b44.c +1 -1
@@ -121,7 +121,7 @@ static struct pci_driver b44_pci_driver = {static const struct ssb_device_id b44_ssb_tbl[] = {SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_ETHERNET ,SSB_ANY_REV ), -SSB_DEVTABLE_END + {}, };MODULE_DEVICE_TABLE (ssb, b44_ssb_tbl);
drivers/net/wireless/b43/main.c +1 -1
@@ -144,7 +144,7 @@ static const struct ssb_device_id b43_ssb_tbl[] = {SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_80211 ,13 ),SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_80211 ,15 ),SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_80211 ,16 ), -SSB_DEVTABLE_END + {}, };MODULE_DEVICE_TABLE (ssb, b43_ssb_tbl);#endif
drivers/net/wireless/b43legacy/main.c +1 -1
@@ -86,7 +86,7 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for the firmware files to load.");static const struct ssb_device_id b43legacy_ssb_tbl[] = {SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_80211 ,2 ),SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_80211 ,4 ), -SSB_DEVTABLE_END + {}, };MODULE_DEVICE_TABLE (ssb, b43legacy_ssb_tbl);
drivers/ssb/driver_gige.c +1 -1
@@ -24,7 +24,7 @@ MODULE_LICENSE("GPL");static const struct ssb_device_id ssb_gige_tbl[] = {SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_ETHERNET_GBIT ,SSB_ANY_REV ), -SSB_DEVTABLE_END + {}, };/* MODULE_DEVICE_TABLE(ssb, ssb_gige_tbl); */
drivers/usb/host/ssb-hcd.c +1 -1
@@ -251,7 +251,7 @@ static const struct ssb_device_id ssb_hcd_table[] = {SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_USB11_HOSTDEV ,SSB_ANY_REV ),SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_USB11_HOST ,SSB_ANY_REV ),SSB_DEVICE (SSB_VENDOR_BROADCOM ,SSB_DEV_USB20_HOST ,SSB_ANY_REV ), - SSB_DEVTABLE_END + {}, };MODULE_DEVICE_TABLE (ssb, ssb_hcd_table);
include/linux/mod_devicetable.h +0 -2
@@ -364,8 +364,6 @@ struct ssb_device_id { } __attribute__((packed, aligned(2)));#define SSB_DEVICE (_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } -#define SSB_DEVTABLE_END \ - { 0, },#define SSB_ANY_VENDOR 0xFFFF#define SSB_ANY_ID 0xFFFF
From: Joe Perches <[email protected]>
Date: Tue, 10 Feb 2015 12:55:03 -0800
Quoted 5 lines
Use the normal {} instead of a macro to terminate an array.
Remove the macro too.
Signed-off-by Joe Perches <[email protected]>
I've applied both of your FOO_END removal patches, thanks Joe.