Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Joe Perches and committed by
David S. Miller
673e2baa f7219b52

+5 -7
+1 -1
drivers/net/ethernet/broadcom/b44.c
··· 121 121 122 122 static const struct ssb_device_id b44_ssb_tbl[] = { 123 123 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET, SSB_ANY_REV), 124 - SSB_DEVTABLE_END 124 + {}, 125 125 }; 126 126 MODULE_DEVICE_TABLE(ssb, b44_ssb_tbl); 127 127
+1 -1
drivers/net/wireless/b43/main.c
··· 144 144 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13), 145 145 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 15), 146 146 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16), 147 - SSB_DEVTABLE_END 147 + {}, 148 148 }; 149 149 MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl); 150 150 #endif
+1 -1
drivers/net/wireless/b43legacy/main.c
··· 86 86 static const struct ssb_device_id b43legacy_ssb_tbl[] = { 87 87 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 2), 88 88 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 4), 89 - SSB_DEVTABLE_END 89 + {}, 90 90 }; 91 91 MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_tbl); 92 92
+1 -1
drivers/ssb/driver_gige.c
··· 24 24 25 25 static const struct ssb_device_id ssb_gige_tbl[] = { 26 26 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET_GBIT, SSB_ANY_REV), 27 - SSB_DEVTABLE_END 27 + {}, 28 28 }; 29 29 /* MODULE_DEVICE_TABLE(ssb, ssb_gige_tbl); */ 30 30
+1 -1
drivers/usb/host/ssb-hcd.c
··· 251 251 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV), 252 252 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV), 253 253 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV), 254 - SSB_DEVTABLE_END 254 + {}, 255 255 }; 256 256 MODULE_DEVICE_TABLE(ssb, ssb_hcd_table); 257 257
-2
include/linux/mod_devicetable.h
··· 365 365 } __attribute__((packed, aligned(2))); 366 366 #define SSB_DEVICE(_vendor, _coreid, _revision) \ 367 367 { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } 368 - #define SSB_DEVTABLE_END \ 369 - { 0, }, 370 368 371 369 #define SSB_ANY_VENDOR 0xFFFF 372 370 #define SSB_ANY_ID 0xFFFF