Staging: rtxxx0: kill RT8270_USB_DEVICES() macro

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c
index 887627f..9900e8d 100644 (file)
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -59,9 +59,123 @@ MODULE_VERSION(STA_DRIVER_VERSION);
 extern INT __devinit rt28xx_probe(IN void *_dev_p, IN void *_dev_id_p,
                                                                        IN UINT argc, OUT PRTMP_ADAPTER *ppAd);
 
+struct usb_device_id rtusb_usb_id[] = {
+       { USB_DEVICE(0x148F, 0x2770) }, /* Ralink */
+#ifndef RT30xx
+       { USB_DEVICE(0x1737, 0x0071) }, /* Linksys WUSB600N */
+       { USB_DEVICE(0x1737, 0x0070) }, /* Linksys */
+#endif
+       { USB_DEVICE(0x148F, 0x2870) }, /* Ralink */
+       { USB_DEVICE(0x148F, 0x3070) }, /* Ralink 3070 */
+#ifdef RT30xx
+       { USB_DEVICE(0x148F, 0x3071) }, /* Ralink 3071 */
+       { USB_DEVICE(0x148F, 0x3072) }, /* Ralink 3072 */
+#endif
+       { USB_DEVICE(0x0B05, 0x1731) }, /* Asus */
+       { USB_DEVICE(0x0B05, 0x1732) }, /* Asus */
+       { USB_DEVICE(0x0B05, 0x1742) }, /* Asus */
+       { USB_DEVICE(0x0DF6, 0x0017) }, /* Sitecom */
+       { USB_DEVICE(0x0DF6, 0x002B) }, /* Sitecom */
+       { USB_DEVICE(0x0DF6, 0x002C) }, /* Sitecom */
+#ifdef RT30xx
+       { USB_DEVICE(0x0DF6, 0x003E) }, /* Sitecom 3070 */
+#endif
+       { USB_DEVICE(0x0DF6, 0x002D) }, /* Sitecom */
+       { USB_DEVICE(0x0DF6, 0x0039) }, /* Sitecom 2770 */
+#ifndef RT30xx
+       { USB_DEVICE(0x0DF6, 0x003F) }, /* Sitecom WL-608 */
+#endif
+       { USB_DEVICE(0x14B2, 0x3C06) }, /* Conceptronic */
+       { USB_DEVICE(0x14B2, 0x3C28) }, /* Conceptronic */
+       { USB_DEVICE(0x2019, 0xED06) }, /* Planex Communications, Inc. */
+#ifndef RT30xx
+       { USB_DEVICE(0x2019, 0xED14) }, /* Planex Communications, Inc. */
+#endif
+       { USB_DEVICE(0x2019, 0xAB25) }, /* Planex Communications, Inc. RT3070 */
+       { USB_DEVICE(0x07D1, 0x3C09) }, /* D-Link */
+       { USB_DEVICE(0x07D1, 0x3C11) }, /* D-Link */
+#ifdef RT30xx
+       { USB_DEVICE(0x2001, 0x3C09) }, /* D-Link */
+       { USB_DEVICE(0x2001, 0x3C0A) }, /* D-Link 3072*/
+#endif
+       { USB_DEVICE(0x14B2, 0x3C07) }, /* AL */
+       { USB_DEVICE(0x14B2, 0x3C12) }, /* AL 3070 */
+       { USB_DEVICE(0x050D, 0x8053) }, /* Belkin */
+#ifndef RT30xx
+       { USB_DEVICE(0x050D, 0x815C) }, /* Belkin */
+       { USB_DEVICE(0x050D, 0x825a) }, /* Belkin */
+#endif
+       { USB_DEVICE(0x14B2, 0x3C23) }, /* Airlink */
+       { USB_DEVICE(0x14B2, 0x3C27) }, /* Airlink */
+       { USB_DEVICE(0x07AA, 0x002F) }, /* Corega */
+       { USB_DEVICE(0x07AA, 0x003C) }, /* Corega */
+       { USB_DEVICE(0x07AA, 0x003F) }, /* Corega */
+       { USB_DEVICE(0x18C5, 0x0012) }, /* Corega 3070 */
+       { USB_DEVICE(0x1044, 0x800B) }, /* Gigabyte */
+#ifdef RT30xx
+       { USB_DEVICE(0x1044, 0x800D) }, /* Gigabyte GN-WB32L 3070 */
+#endif
+       { USB_DEVICE(0x15A9, 0x0006) }, /* Sparklan */
+       { USB_DEVICE(0x083A, 0xB522) }, /* SMC */
+       { USB_DEVICE(0x083A, 0xA618) }, /* SMC */
+#ifdef RT30xx
+       { USB_DEVICE(0x083A, 0x8522) }, /* Arcadyan */
+       { USB_DEVICE(0x083A, 0x7512) }, /* Arcadyan 2770 */
+#endif
+       { USB_DEVICE(0x083A, 0x7522) }, /* Arcadyan */
+#ifdef RT30xx
+       { USB_DEVICE(0x083A, 0x7511) }, /* Arcadyan 3070 */
+#endif
+       { USB_DEVICE(0x0CDE, 0x0022) }, /* ZCOM */
+       { USB_DEVICE(0x0586, 0x3416) }, /* Zyxel */
+       { USB_DEVICE(0x0CDE, 0x0025) }, /* Zyxel */
+       { USB_DEVICE(0x1740, 0x9701) }, /* EnGenius */
+       { USB_DEVICE(0x1740, 0x9702) }, /* EnGenius */
+#ifdef RT30xx
+       { USB_DEVICE(0x1740, 0x9703) }, /* EnGenius 3070 */
+#endif
+       { USB_DEVICE(0x0471, 0x200f) }, /* Philips */
+       { USB_DEVICE(0x14B2, 0x3C25) }, /* Draytek */
+       { USB_DEVICE(0x13D3, 0x3247) }, /* AzureWave */
+#ifdef RT30xx
+       { USB_DEVICE(0x13D3, 0x3273) }, /* AzureWave 3070*/
+#endif
+       { USB_DEVICE(0x083A, 0x6618) }, /* Accton */
+       { USB_DEVICE(0x15c5, 0x0008) }, /* Amit */
+       { USB_DEVICE(0x0E66, 0x0001) }, /* Hawking */
+       { USB_DEVICE(0x0E66, 0x0003) }, /* Hawking */
+       { USB_DEVICE(0x129B, 0x1828) }, /* Siemens */
+       { USB_DEVICE(0x157E, 0x300E) }, /* U-Media */
+       { USB_DEVICE(0x050d, 0x805c) },
+       { USB_DEVICE(0x1482, 0x3C09) }, /* Abocom*/
+       { USB_DEVICE(0x14B2, 0x3C09) }, /* Alpha */
+       { USB_DEVICE(0x04E8, 0x2018) }, /* samsung */
+       { USB_DEVICE(0x07B8, 0x3070) }, /* AboCom 3070 */
+       { USB_DEVICE(0x07B8, 0x3071) }, /* AboCom 3071 */
+#ifndef RT30xx
+       { USB_DEVICE(0x07B8, 0x2870) }, /* AboCom */
+       { USB_DEVICE(0x07B8, 0x2770) }, /* AboCom */
+#else
+       { USB_DEVICE(0x07B8, 0x3072) }, /* Abocom 3072 */
+#endif
+       { USB_DEVICE(0x7392, 0x7711) }, /* Edimax 3070 */
+       { USB_DEVICE(0x5A57, 0x0280) }, /* Zinwell */
+       { USB_DEVICE(0x5A57, 0x0282) }, /* Zinwell */
+#ifdef RT30xx
+       { USB_DEVICE(0x1A32, 0x0304) }, /* Quanta 3070 */
+#endif
+       { USB_DEVICE(0x0789, 0x0162) }, /* Logitec 2870 */
+       { USB_DEVICE(0x0789, 0x0163) }, /* Logitec 2870 */
+       { USB_DEVICE(0x0789, 0x0164) }, /* Logitec 2870 */
+#ifndef RT30xx
+       { USB_DEVICE(0x7392, 0x7717) }, /* Edimax */
+#else
+       { USB_DEVICE(0x1EDA, 0x2310) }, /* AirTies 3070 */
+       { USB_DEVICE(0x1737, 0x0077) }, /* Linksys WUSB54GC-EU v3 */
+#endif
+       { } /* Terminating entry */
+};
 
-/* module table */
-struct usb_device_id    rtusb_usb_id[] = RT2870_USB_DEVICES;
 INT const               rtusb_usb_id_len = sizeof(rtusb_usb_id) / sizeof(struct usb_device_id);
 MODULE_DEVICE_TABLE(usb, rtusb_usb_id);
 

diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h
index b2c9e84..56a6dd0 100644 (file)
--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -74,157 +74,6 @@
 #define        fRTUSB_BULK_OUT_DATA_FRAG_3                             0x00000100
 #define        fRTUSB_BULK_OUT_DATA_FRAG_4                             0x00000200
 
-#ifndef RT30xx
-#define RT2870_USB_DEVICES     \
-{      \
-       {USB_DEVICE(0x148F,0x2770)}, /* Ralink */               \
-       {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */     \
-       {USB_DEVICE(0x1737,0x0070)}, /* Linksys */      \
-       {USB_DEVICE(0x148F,0x2870)}, /* Ralink */               \
-       {USB_DEVICE(0x148F,0x3070)}, /* Ralink */               \
-       {USB_DEVICE(0x0B05,0x1731)}, /* Asus */                 \
-       {USB_DEVICE(0x0B05,0x1732)}, /* Asus */                 \
-       {USB_DEVICE(0x0B05,0x1742)}, /* Asus */                 \
-       {USB_DEVICE(0x0DF6,0x0017)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x002B)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x002C)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x002D)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x0039)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x003F)}, /* Sitecom WL-608 */       \
-       {USB_DEVICE(0x14B2,0x3C06)}, /* Conceptronic */         \
-       {USB_DEVICE(0x14B2,0x3C28)}, /* Conceptronic */         \
-       {USB_DEVICE(0x2019,0xED06)}, /* Planex Communications, Inc. */          \
-       {USB_DEVICE(0x2019,0xED14)}, /* Planex Communications, Inc. */          \
-       {USB_DEVICE(0x2019,0xAB25)}, /* Planex Communications, Inc. RT3070 */           \
-       {USB_DEVICE(0x07D1,0x3C09)}, /* D-Link */               \
-       {USB_DEVICE(0x07D1,0x3C11)}, /* D-Link */               \
-       {USB_DEVICE(0x14B2,0x3C07)}, /* AL */                   \
-       {USB_DEVICE(0x14B2,0x3C12)}, /* AL */           \
-       {USB_DEVICE(0x050D,0x8053)}, /* Belkin */               \
-       {USB_DEVICE(0x050D,0x815C)}, /* Belkin */               \
-       {USB_DEVICE(0x050D,0x825a)}, /* Belkin */               \
-       {USB_DEVICE(0x14B2,0x3C23)}, /* Airlink */              \
-       {USB_DEVICE(0x14B2,0x3C27)}, /* Airlink */              \
-       {USB_DEVICE(0x07AA,0x002F)}, /* Corega */               \
-       {USB_DEVICE(0x07AA,0x003C)}, /* Corega */               \
-       {USB_DEVICE(0x07AA,0x003F)}, /* Corega */               \
-       {USB_DEVICE(0x18C5,0x0012)}, /* Corega */               \
-       {USB_DEVICE(0x1044,0x800B)}, /* Gigabyte */             \
-       {USB_DEVICE(0x15A9,0x0006)}, /* Sparklan */             \
-       {USB_DEVICE(0x083A,0xB522)}, /* SMC */                  \
-       {USB_DEVICE(0x083A,0xA618)}, /* SMC */                  \
-       {USB_DEVICE(0x083A,0x7522)}, /* Arcadyan */             \
-       {USB_DEVICE(0x0CDE,0x0022)}, /* ZCOM */                 \
-       {USB_DEVICE(0x0586,0x3416)}, /* Zyxel */                \
-       {USB_DEVICE(0x0CDE,0x0025)}, /* Zyxel */                \
-       {USB_DEVICE(0x1740,0x9701)}, /* EnGenius */             \
-       {USB_DEVICE(0x1740,0x9702)}, /* EnGenius */             \
-       {USB_DEVICE(0x0471,0x200f)}, /* Philips */              \
-       {USB_DEVICE(0x14B2,0x3C25)}, /* Draytek */              \
-       {USB_DEVICE(0x13D3,0x3247)}, /* AzureWave */    \
-       {USB_DEVICE(0x083A,0x6618)}, /* Accton */               \
-       {USB_DEVICE(0x15c5,0x0008)}, /* Amit */                 \
-       {USB_DEVICE(0x0E66,0x0001)}, /* Hawking */              \
-       {USB_DEVICE(0x0E66,0x0003)}, /* Hawking */              \
-       {USB_DEVICE(0x129B,0x1828)}, /* Siemens */              \
-       {USB_DEVICE(0x157E,0x300E)},    /* U-Media */   \
-       {USB_DEVICE(0x050d,0x805c)},                                    \
-       {USB_DEVICE(0x1482,0x3C09)}, /* Abocom*/                \
-       {USB_DEVICE(0x14B2,0x3C09)}, /* Alpha */                \
-       {USB_DEVICE(0x04E8,0x2018)}, /* samsung */      \
-       {USB_DEVICE(0x07B8,0x3070)}, /* AboCom */               \
-       {USB_DEVICE(0x07B8,0x3071)}, /* AboCom */               \
-       {USB_DEVICE(0x07B8,0x2870)}, /* AboCom */               \
-       {USB_DEVICE(0x07B8,0x2770)}, /* AboCom */               \
-       {USB_DEVICE(0x7392,0x7711)}, /* Edimax */               \
-       {USB_DEVICE(0x5A57,0x0280)}, /* Zinwell */              \
-       {USB_DEVICE(0x5A57,0x0282)}, /* Zinwell */              \
-       {USB_DEVICE(0x0789,0x0162)}, /* Logitec */              \
-       {USB_DEVICE(0x0789,0x0163)}, /* Logitec */              \
-       {USB_DEVICE(0x0789,0x0164)}, /* Logitec */              \
-       {USB_DEVICE(0x7392,0x7717)}, /* Edimax */               \
-       { }/* Terminating entry */                      \
-}
-#endif
-#ifdef RT30xx
-#define RT2870_USB_DEVICES     \
-{      \
-       {USB_DEVICE(0x148F,0x2770)}, /* Ralink */               \
-       {USB_DEVICE(0x148F,0x2870)}, /* Ralink */               \
-       {USB_DEVICE(0x148F,0x3070)}, /* Ralink 3070 */  \
-       {USB_DEVICE(0x148F,0x3071)}, /* Ralink 3071 */  \
-       {USB_DEVICE(0x148F,0x3072)}, /* Ralink 3072 */  \
-       {USB_DEVICE(0x0B05,0x1731)}, /* Asus */                 \
-       {USB_DEVICE(0x0B05,0x1732)}, /* Asus */                 \
-       {USB_DEVICE(0x0B05,0x1742)}, /* Asus */                 \
-       {USB_DEVICE(0x0DF6,0x0017)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x002B)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x002C)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x003E)}, /* Sitecom 3070 */ \
-       {USB_DEVICE(0x0DF6,0x002D)}, /* Sitecom */              \
-       {USB_DEVICE(0x0DF6,0x0039)}, /* Sitecom 2770 */ \
-       {USB_DEVICE(0x14B2,0x3C06)}, /* Conceptronic */         \
-       {USB_DEVICE(0x14B2,0x3C28)}, /* Conceptronic */         \
-       {USB_DEVICE(0x2019,0xED06)}, /* Planex Communications, Inc. */          \
-       {USB_DEVICE(0x2019,0xAB25)}, /* Planex Communications, Inc. RT3070 */           \
-       {USB_DEVICE(0x07D1,0x3C09)}, /* D-Link */               \
-       {USB_DEVICE(0x07D1,0x3C11)}, /* D-Link */               \
-       {USB_DEVICE(0x2001,0x3C09)}, /* D-Link */               \
-       {USB_DEVICE(0x2001,0x3C0A)}, /* D-Link 3072*/   \
-       {USB_DEVICE(0x14B2,0x3C07)}, /* AL */                   \
-       {USB_DEVICE(0x14B2,0x3C12)}, /* AL 3070 */              \
-       {USB_DEVICE(0x050D,0x8053)}, /* Belkin */               \
-       {USB_DEVICE(0x14B2,0x3C23)}, /* Airlink */              \
-       {USB_DEVICE(0x14B2,0x3C27)}, /* Airlink */              \
-       {USB_DEVICE(0x07AA,0x002F)}, /* Corega */               \
-       {USB_DEVICE(0x07AA,0x003C)}, /* Corega */               \
-       {USB_DEVICE(0x07AA,0x003F)}, /* Corega */               \
-       {USB_DEVICE(0x18C5,0x0012)}, /* Corega 3070 */  \
-       {USB_DEVICE(0x1044,0x800B)}, /* Gigabyte */             \
-       {USB_DEVICE(0x1044,0x800D)}, /* Gigabyte GN-WB32L 3070 */               \
-       {USB_DEVICE(0x15A9,0x0006)}, /* Sparklan */             \
-       {USB_DEVICE(0x083A,0xB522)}, /* SMC */                  \
-       {USB_DEVICE(0x083A,0xA618)}, /* SMC */                  \
-       {USB_DEVICE(0x083A,0x8522)}, /* Arcadyan */             \
-       {USB_DEVICE(0x083A,0x7512)}, /* Arcadyan 2770 */                \
-       {USB_DEVICE(0x083A,0x7522)}, /* Arcadyan */             \
-       {USB_DEVICE(0x083A,0x7511)}, /* Arcadyan 3070 */ \
-       {USB_DEVICE(0x0CDE,0x0022)}, /* ZCOM */                 \
-       {USB_DEVICE(0x0586,0x3416)}, /* Zyxel */                \
-       {USB_DEVICE(0x0CDE,0x0025)}, /* Zyxel */                \
-       {USB_DEVICE(0x1740,0x9701)}, /* EnGenius */             \
-       {USB_DEVICE(0x1740,0x9702)}, /* EnGenius */             \
-       {USB_DEVICE(0x1740,0x9703)}, /* EnGenius 3070 */                \
-       {USB_DEVICE(0x0471,0x200f)}, /* Philips */              \
-       {USB_DEVICE(0x14B2,0x3C25)}, /* Draytek */              \
-       {USB_DEVICE(0x13D3,0x3247)}, /* AzureWave */    \
-       {USB_DEVICE(0x13D3,0x3273)}, /* AzureWave 3070*/        \
-       {USB_DEVICE(0x083A,0x6618)}, /* Accton */               \
-       {USB_DEVICE(0x15c5,0x0008)}, /* Amit */                 \
-       {USB_DEVICE(0x0E66,0x0001)}, /* Hawking */              \
-       {USB_DEVICE(0x0E66,0x0003)}, /* Hawking */              \
-       {USB_DEVICE(0x129B,0x1828)}, /* Siemens */              \
-       {USB_DEVICE(0x157E,0x300E)},    /* U-Media */   \
-       {USB_DEVICE(0x050d,0x805c)},                                    \
-       {USB_DEVICE(0x1482,0x3C09)}, /* Abocom*/                \
-       {USB_DEVICE(0x14B2,0x3C09)}, /* Alpha */                \
-       {USB_DEVICE(0x04E8,0x2018)}, /* samsung */      \
-       {USB_DEVICE(0x07B8,0x3070)}, /* AboCom 3070 */  \
-       {USB_DEVICE(0x07B8,0x3071)}, /* AboCom 3071 */  \
-       {USB_DEVICE(0x07B8,0x3072)}, /* Abocom 3072 */  \
-       {USB_DEVICE(0x7392,0x7711)}, /* Edimax 3070 */  \
-       {USB_DEVICE(0x5A57,0x0280)}, /* Zinwell */              \
-       {USB_DEVICE(0x5A57,0x0282)}, /* Zinwell */              \
-       {USB_DEVICE(0x1A32,0x0304)}, /* Quanta 3070 */          \
-       {USB_DEVICE(0x0789,0x0162)}, /* Logitec 2870 */         \
-       {USB_DEVICE(0x0789,0x0163)}, /* Logitec 2870 */         \
-       {USB_DEVICE(0x0789,0x0164)}, /* Logitec 2870 */         \
-       {USB_DEVICE(0x1EDA,0x2310)}, /* AirTies 3070 */         \
-       {USB_DEVICE(0x1737,0x0077)}, /* Linksys WUSB54GC-EU v3 */       \
-       { }/* Terminating entry */                      \
-}
-#endif
-
 #define        FREE_HTTX_RING(_p, _b, _t)                      \
 {                                                                              \
        if ((_t)->ENextBulkOutPosition == (_t)->CurWritePosition)                               \