Commit f7219b52 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80ad0d4a
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
static const struct bcma_device_id bgmac_bcma_tbl[] = { 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_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_CORE(BCMA_MANUF_BCM, BCMA_CORE_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
BCMA_CORETABLE_END {},
}; };
MODULE_DEVICE_TABLE(bcma, bgmac_bcma_tbl); MODULE_DEVICE_TABLE(bcma, bgmac_bcma_tbl);
......
...@@ -127,7 +127,7 @@ static const struct bcma_device_id b43_bcma_tbl[] = { ...@@ -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, 0x1E, BCMA_ANY_CLASS),
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x28, 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_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x2A, BCMA_ANY_CLASS),
BCMA_CORETABLE_END {},
}; };
MODULE_DEVICE_TABLE(bcma, b43_bcma_tbl); MODULE_DEVICE_TABLE(bcma, b43_bcma_tbl);
#endif #endif
......
...@@ -99,7 +99,7 @@ static struct bcma_device_id brcms_coreid_table[] = { ...@@ -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, 17, BCMA_ANY_CLASS),
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, 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_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),
BCMA_CORETABLE_END {},
}; };
MODULE_DEVICE_TABLE(bcma, brcms_coreid_table); MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
......
...@@ -216,7 +216,7 @@ static struct spi_board_info bcm53xx_info = { ...@@ -216,7 +216,7 @@ static struct spi_board_info bcm53xx_info = {
static const struct bcma_device_id bcm53xxspi_bcma_tbl[] = { 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_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_QSPI, BCMA_ANY_REV, BCMA_ANY_CLASS),
BCMA_CORETABLE_END {},
}; };
MODULE_DEVICE_TABLE(bcma, bcm53xxspi_bcma_tbl); MODULE_DEVICE_TABLE(bcma, bcm53xxspi_bcma_tbl);
......
...@@ -306,7 +306,7 @@ static int bcma_hcd_resume(struct bcma_device *dev) ...@@ -306,7 +306,7 @@ static int bcma_hcd_resume(struct bcma_device *dev)
static const struct bcma_device_id bcma_hcd_table[] = { 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_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
BCMA_CORETABLE_END {},
}; };
MODULE_DEVICE_TABLE(bcma, bcma_hcd_table); MODULE_DEVICE_TABLE(bcma, bcma_hcd_table);
......
...@@ -381,8 +381,6 @@ struct bcma_device_id { ...@@ -381,8 +381,6 @@ struct bcma_device_id {
} __attribute__((packed,aligned(2))); } __attribute__((packed,aligned(2)));
#define BCMA_CORE(_manuf, _id, _rev, _class) \ #define BCMA_CORE(_manuf, _id, _rev, _class) \
{ .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, } { .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, }
#define BCMA_CORETABLE_END \
{ 0, },
#define BCMA_ANY_MANUF 0xFFFF #define BCMA_ANY_MANUF 0xFFFF
#define BCMA_ANY_ID 0xFFFF #define BCMA_ANY_ID 0xFFFF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment