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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index d86d6baf9681f2cb637591f3830440e602a35cd7..bd5916a60cb5bb7bb84d2b96aa370c22a611cb80 100644 (file)
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -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);
 

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 6acb2b51ab8f3e7f0bd8b019cc37b8e26f29e60b..ccbdb05b28cd7e2dc457afe9443e35ac2ca3fc21 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -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

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1aec2146a2bfb5ecfe3fe6d8452236799058d9c8..4e58c0069830b698b0689203172a9a8f4d458e4b 100644 (file)
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -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);
 

diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c
index 21f71a1581fa6cefcd3e055e4001aa259ee92729..e9734051e3c4adaedaa4131948355d5dd6fd1e00 100644 (file)
--- a/drivers/ssb/driver_gige.c
+++ b/drivers/ssb/driver_gige.c
@@ -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); */
 

diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c
index 0196f766df734f48352fd8c5217d08963aab444f..ffc32f4b1b1b869992cd11dafab9cad977b1dd18 100644 (file)
--- a/drivers/usb/host/ssb-hcd.c
+++ b/drivers/usb/host/ssb-hcd.c
@@ -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);
 

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 6711d57f9c059f0f170f2f2f40f871132a705640..2bb97175b6ccc8657fb1f7b9e2f3a8ca582d7f2e 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -365,8 +365,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