提交 673e2baa 编写于 作者: J Joe Perches 提交者: David S. Miller

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: NJoe Perches <joe@perches.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f7219b52
...@@ -121,7 +121,7 @@ static struct pci_driver b44_pci_driver = { ...@@ -121,7 +121,7 @@ static struct pci_driver b44_pci_driver = {
static const struct ssb_device_id b44_ssb_tbl[] = { static const struct ssb_device_id b44_ssb_tbl[] = {
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET, SSB_ANY_REV), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET, SSB_ANY_REV),
SSB_DEVTABLE_END {},
}; };
MODULE_DEVICE_TABLE(ssb, b44_ssb_tbl); MODULE_DEVICE_TABLE(ssb, b44_ssb_tbl);
......
...@@ -144,7 +144,7 @@ static const struct ssb_device_id b43_ssb_tbl[] = { ...@@ -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, 13),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 15), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 15),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16),
SSB_DEVTABLE_END {},
}; };
MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl); MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl);
#endif #endif
......
...@@ -86,7 +86,7 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for the firmware files to load."); ...@@ -86,7 +86,7 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for the firmware files to load.");
static const struct ssb_device_id b43legacy_ssb_tbl[] = { 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, 2),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 4), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 4),
SSB_DEVTABLE_END {},
}; };
MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_tbl); MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_tbl);
......
...@@ -24,7 +24,7 @@ MODULE_LICENSE("GPL"); ...@@ -24,7 +24,7 @@ MODULE_LICENSE("GPL");
static const struct ssb_device_id ssb_gige_tbl[] = { static const struct ssb_device_id ssb_gige_tbl[] = {
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET_GBIT, SSB_ANY_REV), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET_GBIT, SSB_ANY_REV),
SSB_DEVTABLE_END {},
}; };
/* MODULE_DEVICE_TABLE(ssb, ssb_gige_tbl); */ /* MODULE_DEVICE_TABLE(ssb, ssb_gige_tbl); */
......
...@@ -251,7 +251,7 @@ static const struct ssb_device_id ssb_hcd_table[] = { ...@@ -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_HOSTDEV, SSB_ANY_REV),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, 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_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
SSB_DEVTABLE_END {},
}; };
MODULE_DEVICE_TABLE(ssb, ssb_hcd_table); MODULE_DEVICE_TABLE(ssb, ssb_hcd_table);
......
...@@ -365,8 +365,6 @@ struct ssb_device_id { ...@@ -365,8 +365,6 @@ struct ssb_device_id {
} __attribute__((packed, aligned(2))); } __attribute__((packed, aligned(2)));
#define SSB_DEVICE(_vendor, _coreid, _revision) \ #define SSB_DEVICE(_vendor, _coreid, _revision) \
{ .vendor = _vendor, .coreid = _coreid, .revision = _revision, } { .vendor = _vendor, .coreid = _coreid, .revision = _revision, }
#define SSB_DEVTABLE_END \
{ 0, },
#define SSB_ANY_VENDOR 0xFFFF #define SSB_ANY_VENDOR 0xFFFF
#define SSB_ANY_ID 0xFFFF #define SSB_ANY_ID 0xFFFF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册