Assorted rt2x00 cleanups and fixes.
cover Assorted rt2x00 cleanups and fixes.
This is a patch series with some random clean ups and minor bug fixes. The series is against the wireless-testing tree and nothing is in there for 2.6.33.
Shortlog and diffstat are as follows:
Gertjan van Wingerde (5):
rt2x00: Add USB ID for Linksys WUSB 600N rev 2.
rt2x00: Fix checks for rt2800 SOC support.
rt2x00: Let rt2800lib check CONFIG_RT2X00_LIB_USB instead of CONFIG_RT2800USB
rt2x00: convert RT2800PCI_PCI and RT2800PCI_SOC Kconfig symbols to booleans.
rt2x00: Cleanup chip handling helper functions.
drivers/net/wireless/rt2x00/Kconfig | 4 +- drivers/net/wireless/rt2x00/rt2400pci.c | 5 +- drivers/net/wireless/rt2x00/rt2500pci.c | 39 ++++++------- drivers/net/wireless/rt2x00/rt2500usb.c | 38 ++++++------- drivers/net/wireless/rt2x00/rt2800lib.c | 94 +++++++++++++++---------------- drivers/net/wireless/rt2x00/rt2800pci.c | 25 +++------ drivers/net/wireless/rt2x00/rt2800usb.c | 5 +- drivers/net/wireless/rt2x00/rt2x00.h | 24 ++++---- drivers/net/wireless/rt2x00/rt61pci.c | 29 ++++------ drivers/net/wireless/rt2x00/rt73usb.c | 36 +++++------- 10 files changed, 137 insertions(+), 162 deletions(-)
PATCH 1/5 rt2x00: Add USB ID for Linksys WUSB 600N rev 2.
This is a rt2870 based device.
--- drivers/net/wireless/rt2x00/rt2800usb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2800usb.c +1 -0
@@ -933,6 +933,7 @@ static struct usb_device_id rt2800usb_device_table[] = { { USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x1737, 0x0077), USB_DEVICE_DATA(&rt2800usb_ops) }, + { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },/* Logitec */ { USB_DEVICE(0x0789, 0x0162), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x0789, 0x0163), USB_DEVICE_DATA(&rt2800usb_ops) },
Signature · 1 line
1.6.5.7
PATCH 2/5 rt2x00: Fix checks for rt2800 SOC support.
Fix checking for SOC support in rt2800pci. The wrong config (an unexisting one) was checked.
--- drivers/net/wireless/rt2x00/rt2800pci.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/wireless/rt2x00/rt2800pci.c +9 -9
@@ -52,8 +52,8 @@#define CONFIG_RT2800PCI_PCI #endif -#ifdef CONFIG_RT2800PCI_WISOC_MODULE -#define CONFIG_RT2800PCI_WISOC +#ifdef CONFIG_RT2800PCI_SOC_MODULE +#define CONFIG_RT2800PCI_SOC #endif /*
@@ -87,7 +87,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)rt2800_register_write (rt2x00dev,H2M_MAILBOX_CID , ~0 ); } -#ifdef CONFIG_RT2800PCI_WISOC +#ifdef CONFIG_RT2800PCI_SOC static void rt2800pci_read_eeprom_soc (struct rt2x00_dev *rt2x00dev) {u32 *base_addr = (u32 *)KSEG1ADDR (0x1F040000 );/* XXX for RT3052 */
@@ -98,7 +98,7 @@ static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)static inline void rt2800pci_read_eeprom_soc (struct rt2x00_dev *rt2x00dev) { } -#endif /* CONFIG_RT2800PCI_WISOC */ +#endif /* CONFIG_RT2800PCI_SOC */ #ifdef CONFIG_RT2800PCI_PCI static void rt2800pci_eepromregister_read (struct eeprom_93cx6 *eeprom)
@@ -1251,7 +1251,7 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_device_table);#endif /* CONFIG_RT2800PCI_PCI */ MODULE_LICENSE ("GPL" ); -#ifdef CONFIG_RT2800PCI_WISOC +#ifdef CONFIG_RT2800PCI_SOC #if defined(CONFIG_RALINK_RT288X )__rt2x00soc_probe (RT2880 , &rt2800pci_ops);#elif defined(CONFIG_RALINK_RT305X )
@@ -1269,7 +1269,7 @@ static struct platform_driver rt2800soc_driver = { .suspend = rt2x00soc_suspend, .resume = rt2x00soc_resume, }; -#endif /* CONFIG_RT2800PCI_WISOC */ +#endif /* CONFIG_RT2800PCI_SOC */ #ifdef CONFIG_RT2800PCI_PCI static struct pci_driver rt2800pci_driver = {
@@ -1286,7 +1286,7 @@ static int __init rt2800pci_init(void) {int ret =0 ; -#ifdef CONFIG_RT2800PCI_WISOC +#ifdef CONFIG_RT2800PCI_SOC ret =platform_driver_register (&rt2800soc_driver);if (ret)return ret;
@@ -1294,7 +1294,7 @@ static int __init rt2800pci_init(void)#ifdef CONFIG_RT2800PCI_PCI ret =pci_register_driver (&rt2800pci_driver);if (ret) { -#ifdef CONFIG_RT2800PCI_WISOC +#ifdef CONFIG_RT2800PCI_SOC platform_driver_unregister (&rt2800soc_driver);#endif return ret;
@@ -1309,7 +1309,7 @@ static void __exit rt2800pci_exit(void)#ifdef CONFIG_RT2800PCI_PCI pci_unregister_driver (&rt2800pci_driver);#endif -#ifdef CONFIG_RT2800PCI_WISOC +#ifdef CONFIG_RT2800PCI_SOC platform_driver_unregister (&rt2800soc_driver);#endif }
Signature · 1 line
1.6.5.7
PATCH 3/5 rt2x00: Let rt2800lib check CONFIG_RT2X00_LIB_USB instead of CONFIG_RT2800USB
rt2800lib currently checks whether RT2800USB is enabled in the configuration. Strictly speaking this is not necessary, it only needs to know whether the generic rt2x00usb library functions are available. Therefore check for RT2X00_LIB_USB instead.
--- drivers/net/wireless/rt2x00/rt2800lib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2800lib.c +2 -2
@@ -37,7 +37,7 @@#include <linux/module.h> #include "rt2x00.h" -#if defined(CONFIG_RT2800USB ) || defined(CONFIG_RT2800USB_MODULE ) +#if defined(CONFIG_RT2X00_LIB_USB ) || defined(CONFIG_RT2X00_LIB_USB_MODULE )#include "rt2x00usb.h" #endif #include "rt2800lib.h"
@@ -1121,7 +1121,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)if (rt2x00_intf_is_usb (rt2x00dev)) {rt2800_register_write (rt2x00dev,USB_DMA_CFG ,0x00000000 ); -#if defined(CONFIG_RT2800USB ) || defined(CONFIG_RT2800USB_MODULE ) +#if defined(CONFIG_RT2X00_LIB_USB ) || defined(CONFIG_RT2X00_LIB_USB_MODULE )rt2x00usb_vendor_request_sw (rt2x00dev,USB_DEVICE_MODE ,0 ,USB_MODE_RESET ,REGISTER_TIMEOUT );#endif
Signature · 1 line
1.6.5.7
PATCH 4/5 rt2x00: convert RT2800PCI_PCI and RT2800PCI_SOC Kconfig symbols to booleans.
There is no need for Kconfig symbols RT2800PCI_PCI and RT2800PCI_SOC to be tristates, as they are only used to check whether RT2800 PCI or SOC support is to be compiled in.
--- drivers/net/wireless/rt2x00/Kconfig | 4 ++-- drivers/net/wireless/rt2x00/rt2800pci.c | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/net/wireless/rt2x00/Kconfig +2 -2
@@ -54,12 +54,12 @@ config RT61PCI When compiled as a module, this driver will be called rt61pci. config RT2800PCI_PCI - tristate + boolean depends on PCI default y config RT2800PCI_SOC - tristate + boolean depends on RALINK_RT288X || RALINK_RT305X default y
drivers/net/wireless/rt2x00/rt2800pci.c +0 -8
@@ -48,14 +48,6 @@#include "rt2800.h" #include "rt2800pci.h" -#ifdef CONFIG_RT2800PCI_PCI_MODULE -#define CONFIG_RT2800PCI_PCI -#endif - -#ifdef CONFIG_RT2800PCI_SOC_MODULE -#define CONFIG_RT2800PCI_SOC -#endif -/* * Allow hardware encryption to be disabled. */
Signature · 1 line
1.6.5.7
PATCH 5/5 rt2x00: Cleanup chip handling helper functions.
Let each of them take a struct rt2x00_dev pointer as argument instead of a mixture of struct rt2x00_chip and struct rt2x00_dev pointers. Preparation for further clean ups in the rt2x00 chip handling, especially for rt2800 devices.
--- drivers/net/wireless/rt2x00/rt2400pci.c | 5 +- drivers/net/wireless/rt2x00/rt2500pci.c | 39 +++++++------- drivers/net/wireless/rt2x00/rt2500usb.c | 38 ++++++------- drivers/net/wireless/rt2x00/rt2800lib.c | 90 +++++++++++++++---------------- drivers/net/wireless/rt2x00/rt2800pci.c | 3 +- drivers/net/wireless/rt2x00/rt2800usb.c | 4 +- drivers/net/wireless/rt2x00/rt2x00.h | 24 ++++---- drivers/net/wireless/rt2x00/rt61pci.c | 29 ++++------ drivers/net/wireless/rt2x00/rt73usb.c | 36 ++++++------- 9 files changed, 125 insertions(+), 143 deletions(-)
drivers/net/wireless/rt2x00/rt2400pci.c +2 -3
@@ -451,7 +451,7 @@ static void rt2400pci_config_channel(struct rt2x00_dev *rt2x00dev,/* * RF2420 chipset don't need any additional actions. */ -if (rt2x00_rf (&rt2x00dev->chip,RF2420 )) +if (rt2x00_rf (rt2x00dev,RF2420 ))return ;/*
@@ -1343,8 +1343,7 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)rt2x00_set_chip_rf (rt2x00dev, value, reg);rt2x00_print_chip (rt2x00dev); -if (!rt2x00_rf (&rt2x00dev->chip,RF2420 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2421 )) { +if (!rt2x00_rf (rt2x00dev,RF2420 ) && !rt2x00_rf (rt2x00dev,RF2421 )) {ERROR (rt2x00dev,"Invalid RF chipset detected.\n" );return -ENODEV ; }
drivers/net/wireless/rt2x00/rt2500pci.c +19 -20
@@ -440,8 +440,7 @@ static void rt2500pci_config_ant(struct rt2x00_dev *rt2x00dev,/* * RT2525E and RT5222 need to flip TX I/Q */ -if (rt2x00_rf (&rt2x00dev->chip,RF2525E ) || -rt2x00_rf (&rt2x00dev->chip,RF5222 )) { +if (rt2x00_rf (rt2x00dev,RF2525E ) ||rt2x00_rf (rt2x00dev,RF5222 )) {rt2x00_set_field8 (&r2,BBP_R2_TX_IQ_FLIP ,1 );rt2x00_set_field32 (®,BBPCSR1_CCK_FLIP ,1 );rt2x00_set_field32 (®,BBPCSR1_OFDM_FLIP ,1 );
@@ -449,7 +448,7 @@ static void rt2500pci_config_ant(struct rt2x00_dev *rt2x00dev,/* * RT2525E does not need RX I/Q Flip. */ -if (rt2x00_rf (&rt2x00dev->chip,RF2525E )) +if (rt2x00_rf (rt2x00dev,RF2525E ))rt2x00_set_field8 (&r14,BBP_R14_RX_IQ_FLIP ,0 ); }else {rt2x00_set_field32 (®,BBPCSR1_CCK_FLIP ,0 );
@@ -475,14 +474,14 @@ static void rt2500pci_config_channel(struct rt2x00_dev *rt2x00dev,* Switch on tuning bits. * For RT2523 devices we do not need to update the R1 register. */ -if (!rt2x00_rf (&rt2x00dev->chip,RF2523 )) +if (!rt2x00_rf (rt2x00dev,RF2523 ))rt2x00_set_field32 (&rf->rf1,RF1_TUNER ,1 );rt2x00_set_field32 (&rf->rf3,RF3_TUNER ,1 );/* * For RT2525 we should first set the channel to half band higher. */ -if (rt2x00_rf (&rt2x00dev->chip,RF2525 )) { +if (rt2x00_rf (rt2x00dev,RF2525 )) {static const u32 vals[] = {0x00080cbe ,0x00080d02 ,0x00080d06 ,0x00080d0a ,0x00080d0e ,0x00080d12 ,0x00080d16 ,0x00080d1a ,
@@ -516,7 +515,7 @@ static void rt2500pci_config_channel(struct rt2x00_dev *rt2x00dev,* Switch off tuning bits. * For RT2523 devices we do not need to update the R1 register. */ -if (!rt2x00_rf (&rt2x00dev->chip,RF2523 )) { +if (!rt2x00_rf (rt2x00dev,RF2523 )) {rt2x00_set_field32 (&rf->rf1,RF1_TUNER ,0 );rt2500pci_rf_write (rt2x00dev,1 , rf->rf1); }
@@ -640,7 +639,7 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev,* up to version C the link tuning should halt after 20 * seconds while being associated. */ -if (rt2x00_rev (&rt2x00dev->chip) <RT2560_VERSION_D && +if (rt2x00_rev (rt2x00dev) <RT2560_VERSION_D && rt2x00dev->intf_associated && count >20 )return ;
@@ -650,7 +649,7 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev,* should go straight to dynamic CCA tuning when they * are not associated. */ -if (rt2x00_rev (&rt2x00dev->chip) <RT2560_VERSION_D || +if (rt2x00_rev (rt2x00dev) <RT2560_VERSION_D || !rt2x00dev->intf_associated) goto dynamic_cca_tune;
@@ -1507,12 +1506,12 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)rt2x00_set_chip_rf (rt2x00dev, value, reg);rt2x00_print_chip (rt2x00dev); -if (!rt2x00_rf (&rt2x00dev->chip,RF2522 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2523 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2524 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2525 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2525E ) && - !rt2x00_rf (&rt2x00dev->chip,RF5222 )) { +if (!rt2x00_rf (rt2x00dev,RF2522 ) && + !rt2x00_rf (rt2x00dev,RF2523 ) && + !rt2x00_rf (rt2x00dev,RF2524 ) && + !rt2x00_rf (rt2x00dev,RF2525 ) && + !rt2x00_rf (rt2x00dev,RF2525E ) && + !rt2x00_rf (rt2x00dev,RF5222 )) {ERROR (rt2x00dev,"Invalid RF chipset detected.\n" );return -ENODEV ; }
@@ -1744,22 +1743,22 @@ static int rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) spec->supported_bands =SUPPORT_BAND_2GHZ ; spec->supported_rates =SUPPORT_RATE_CCK |SUPPORT_RATE_OFDM ; -if (rt2x00_rf (&rt2x00dev->chip,RF2522 )) { +if (rt2x00_rf (rt2x00dev,RF2522 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2522); spec->channels = rf_vals_bg_2522; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2523 )) { + }else if (rt2x00_rf (rt2x00dev,RF2523 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2523); spec->channels = rf_vals_bg_2523; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2524 )) { + }else if (rt2x00_rf (rt2x00dev,RF2524 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2524); spec->channels = rf_vals_bg_2524; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2525 )) { + }else if (rt2x00_rf (rt2x00dev,RF2525 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2525); spec->channels = rf_vals_bg_2525; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2525E )) { + }else if (rt2x00_rf (rt2x00dev,RF2525E )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2525e); spec->channels = rf_vals_bg_2525e; - }else if (rt2x00_rf (&rt2x00dev->chip,RF5222 )) { + }else if (rt2x00_rf (rt2x00dev,RF5222 )) { spec->supported_bands |=SUPPORT_BAND_5GHZ ; spec->num_channels =ARRAY_SIZE (rf_vals_5222); spec->channels = rf_vals_5222;
drivers/net/wireless/rt2x00/rt2500usb.c +18 -20
@@ -565,8 +565,7 @@ static void rt2500usb_config_ant(struct rt2x00_dev *rt2x00dev,/* * RT2525E and RT5222 need to flip TX I/Q */ -if (rt2x00_rf (&rt2x00dev->chip,RF2525E ) || -rt2x00_rf (&rt2x00dev->chip,RF5222 )) { +if (rt2x00_rf (rt2x00dev,RF2525E ) ||rt2x00_rf (rt2x00dev,RF5222 )) {rt2x00_set_field8 (&r2,BBP_R2_TX_IQ_FLIP ,1 );rt2x00_set_field16 (&csr5,PHY_CSR5_CCK_FLIP ,1 );rt2x00_set_field16 (&csr6,PHY_CSR6_OFDM_FLIP ,1 );
@@ -574,7 +573,7 @@ static void rt2500usb_config_ant(struct rt2x00_dev *rt2x00dev,/* * RT2525E does not need RX I/Q Flip. */ -if (rt2x00_rf (&rt2x00dev->chip,RF2525E )) +if (rt2x00_rf (rt2x00dev,RF2525E ))rt2x00_set_field8 (&r14,BBP_R14_RX_IQ_FLIP ,0 ); }else {rt2x00_set_field16 (&csr5,PHY_CSR5_CCK_FLIP ,0 );
@@ -598,7 +597,7 @@ static void rt2500usb_config_channel(struct rt2x00_dev *rt2x00dev,/* * For RT2525E we should first set the channel to half band higher. */ -if (rt2x00_rf (&rt2x00dev->chip,RF2525E )) { +if (rt2x00_rf (rt2x00dev,RF2525E )) {static const u32 vals[] = {0x000008aa ,0x000008ae ,0x000008ae ,0x000008b2 ,0x000008b2 ,0x000008b6 ,0x000008b6 ,0x000008ba ,
@@ -793,7 +792,7 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev)rt2x00_set_field16 (®,MAC_CSR1_HOST_READY ,1 );rt2500usb_register_write (rt2x00dev,MAC_CSR1 , reg); -if (rt2x00_rev (&rt2x00dev->chip) >=RT2570_VERSION_C ) { +if (rt2x00_rev (rt2x00dev) >=RT2570_VERSION_C ) {rt2500usb_register_read (rt2x00dev,PHY_CSR2 , ®);rt2x00_set_field16 (®,PHY_CSR2_LNA ,0 ); }else {
@@ -1411,19 +1410,18 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)rt2x00_set_chip (rt2x00dev,RT2570 , value, reg);rt2x00_print_chip (rt2x00dev); -if (!rt2x00_check_rev (&rt2x00dev->chip,0x000ffff0 ,0 ) || -rt2x00_check_rev (&rt2x00dev->chip,0x0000000f ,0 )) { - +if (!rt2x00_check_rev (rt2x00dev,0x000ffff0 ,0 ) || +rt2x00_check_rev (rt2x00dev,0x0000000f ,0 )) {ERROR (rt2x00dev,"Invalid RT chipset detected.\n" );return -ENODEV ; } -if (!rt2x00_rf (&rt2x00dev->chip,RF2522 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2523 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2524 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2525 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2525E ) && - !rt2x00_rf (&rt2x00dev->chip,RF5222 )) { +if (!rt2x00_rf (rt2x00dev,RF2522 ) && + !rt2x00_rf (rt2x00dev,RF2523 ) && + !rt2x00_rf (rt2x00dev,RF2524 ) && + !rt2x00_rf (rt2x00dev,RF2525 ) && + !rt2x00_rf (rt2x00dev,RF2525E ) && + !rt2x00_rf (rt2x00dev,RF5222 )) {ERROR (rt2x00dev,"Invalid RF chipset detected.\n" );return -ENODEV ; }
@@ -1667,22 +1665,22 @@ static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) spec->supported_bands =SUPPORT_BAND_2GHZ ; spec->supported_rates =SUPPORT_RATE_CCK |SUPPORT_RATE_OFDM ; -if (rt2x00_rf (&rt2x00dev->chip,RF2522 )) { +if (rt2x00_rf (rt2x00dev,RF2522 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2522); spec->channels = rf_vals_bg_2522; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2523 )) { + }else if (rt2x00_rf (rt2x00dev,RF2523 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2523); spec->channels = rf_vals_bg_2523; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2524 )) { + }else if (rt2x00_rf (rt2x00dev,RF2524 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2524); spec->channels = rf_vals_bg_2524; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2525 )) { + }else if (rt2x00_rf (rt2x00dev,RF2525 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2525); spec->channels = rf_vals_bg_2525; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2525E )) { + }else if (rt2x00_rf (rt2x00dev,RF2525E )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2525e); spec->channels = rf_vals_bg_2525e; - }else if (rt2x00_rf (&rt2x00dev->chip,RF5222 )) { + }else if (rt2x00_rf (rt2x00dev,RF5222 )) { spec->supported_bands |=SUPPORT_BAND_5GHZ ; spec->num_channels =ARRAY_SIZE (rf_vals_5222); spec->channels = rf_vals_5222;
drivers/net/wireless/rt2x00/rt2800lib.c +43 -47
205 lines not on this page · raw message
drivers/net/wireless/rt2x00/rt2800pci.c +1 -2
@@ -1121,8 +1121,7 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)/* * This device requires firmware. */ -if (!rt2x00_rt (&rt2x00dev->chip,RT2880 ) && - !rt2x00_rt (&rt2x00dev->chip,RT3052 )) +if (!rt2x00_rt (rt2x00dev,RT2880 ) && !rt2x00_rt (rt2x00dev,RT3052 ))__set_bit (DRIVER_REQUIRE_FIRMWARE , &rt2x00dev->flags);__set_bit (DRIVER_REQUIRE_DMA , &rt2x00dev->flags);__set_bit (DRIVER_REQUIRE_L2PAD , &rt2x00dev->flags);
drivers/net/wireless/rt2x00/rt2800usb.c +2 -2
@@ -92,7 +92,7 @@ static bool rt2800usb_check_crc(const u8 *data, const size_t len)static int rt2800usb_check_firmware (struct rt2x00_dev *rt2x00dev,const u8 *data,const size_t len) { -u16 chipset = (rt2x00_rev (&rt2x00dev->chip) >>16 ) &0xffff ; +u16 chipset = (rt2x00_rev (rt2x00dev) >>16 ) &0xffff ;size_t offset =0 ;/*
@@ -138,7 +138,7 @@ static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,u32 reg;u32 offset;u32 length; -u16 chipset = (rt2x00_rev (&rt2x00dev->chip) >>16 ) &0xffff ; +u16 chipset = (rt2x00_rev (rt2x00dev) >>16 ) &0xffff ;/* * Check which section of the firmware we need.
drivers/net/wireless/rt2x00/rt2x00.h +12 -12
@@ -937,25 +937,25 @@ static inline void rt2x00_print_chip(struct rt2x00_dev *rt2x00dev) rt2x00dev->chip.rt, rt2x00dev->chip.rf, rt2x00dev->chip.rev); } -static inline char rt2x00_rt (const struct rt2x00_chip *chipset,const u16 chip) +static inline char rt2x00_rt (struct rt2x00_dev *rt2x00dev,const u16 rt) { -return (chipset->rt == chip); +return (rt2x00dev->chip.rt == rt); } -static inline char rt2x00_rf (const struct rt2x00_chip *chipset,const u16 chip) +static inline char rt2x00_rf (struct rt2x00_dev *rt2x00dev,const u16 rf) { -return (chipset->rf == chip); +return (rt2x00dev->chip.rf == rf); } -static inline u32 rt2x00_rev (const struct rt2x00_chip *chipset) +static inline u32 rt2x00_rev (struct rt2x00_dev *rt2x00dev) { -return chipset->rev; +return rt2x00dev->chip.rev; } -static inline bool rt2x00_check_rev (const struct rt2x00_chip *chipset, +static inline bool rt2x00_check_rev (struct rt2x00_dev *rt2x00dev,const u32 mask,const u32 rev) { -return ((chipset->rev & mask) == rev); +return ((rt2x00dev->chip.rev & mask) == rev); } static inline void rt2x00_set_chip_intf(struct rt2x00_dev *rt2x00dev,
@@ -964,20 +964,20 @@ static inline void rt2x00_set_chip_intf(struct rt2x00_dev *rt2x00dev, rt2x00dev->chip.intf = intf; } -static inline bool rt2x00_intf (const struct rt2x00_chip *chipset, +static inline bool rt2x00_intf (struct rt2x00_dev *rt2x00dev,enum rt2x00_chip_intf intf) { -return (chipset->intf == intf); +return (rt2x00dev->chip.intf == intf); }static inline bool rt2x00_intf_is_pci (struct rt2x00_dev *rt2x00dev) { -return rt2x00_intf (&rt2x00dev->chip,RT2X00_CHIP_INTF_PCI ); +return rt2x00_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); }static inline bool rt2x00_intf_is_usb (struct rt2x00_dev *rt2x00dev) { -return rt2x00_intf (&rt2x00dev->chip,RT2X00_CHIP_INTF_USB ); +return rt2x00_intf (rt2x00dev,RT2X00_CHIP_INTF_USB ); }/**
drivers/net/wireless/rt2x00/rt61pci.c +12 -17
@@ -637,8 +637,7 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,rt61pci_bbp_read (rt2x00dev,4 , &r4);rt61pci_bbp_read (rt2x00dev,77 , &r77); -rt2x00_set_field8 (&r3,BBP_R3_SMART_MODE , -rt2x00_rf (&rt2x00dev->chip,RF5325 )); +rt2x00_set_field8 (&r3,BBP_R3_SMART_MODE ,rt2x00_rf (rt2x00dev,RF5325 ));/* * Configure the RX antenna.
@@ -684,8 +683,7 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev,rt61pci_bbp_read (rt2x00dev,4 , &r4);rt61pci_bbp_read (rt2x00dev,77 , &r77); -rt2x00_set_field8 (&r3,BBP_R3_SMART_MODE , -rt2x00_rf (&rt2x00dev->chip,RF2529 )); +rt2x00_set_field8 (&r3,BBP_R3_SMART_MODE ,rt2x00_rf (rt2x00dev,RF2529 ));rt2x00_set_field8 (&r4,BBP_R4_RX_FRAME_END , !test_bit (CONFIG_FRAME_TYPE , &rt2x00dev->flags));
@@ -833,12 +831,11 @@ static void rt61pci_config_ant(struct rt2x00_dev *rt2x00dev,rt2x00pci_register_write (rt2x00dev,PHY_CSR0 , reg); -if (rt2x00_rf (&rt2x00dev->chip,RF5225 ) || -rt2x00_rf (&rt2x00dev->chip,RF5325 )) +if (rt2x00_rf (rt2x00dev,RF5225 ) ||rt2x00_rf (rt2x00dev,RF5325 ))rt61pci_config_antenna_5x (rt2x00dev, ant); -else if (rt2x00_rf (&rt2x00dev->chip,RF2527 )) +else if (rt2x00_rf (rt2x00dev,RF2527 ))rt61pci_config_antenna_2x (rt2x00dev, ant); -else if (rt2x00_rf (&rt2x00dev->chip,RF2529 )) { +else if (rt2x00_rf (rt2x00dev,RF2529 )) {if (test_bit (CONFIG_DOUBLE_ANTENNA , &rt2x00dev->flags))rt61pci_config_antenna_2x (rt2x00dev, ant);else
@@ -879,8 +876,7 @@ static void rt61pci_config_channel(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (&rf->rf3,RF3_TXPOWER ,TXPOWER_TO_DEV (txpower));rt2x00_set_field32 (&rf->rf4,RF4_FREQ_OFFSET , rt2x00dev->freq_offset); - smart = !(rt2x00_rf (&rt2x00dev->chip,RF5225 ) || -rt2x00_rf (&rt2x00dev->chip,RF2527 )); + smart = !(rt2x00_rf (rt2x00dev,RF5225 ) ||rt2x00_rf (rt2x00dev,RF2527 ));rt61pci_bbp_read (rt2x00dev,3 , &r3);rt2x00_set_field8 (&r3,BBP_R3_SMART_MODE , smart);
@@ -2302,10 +2298,10 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)rt2x00_set_chip_rf (rt2x00dev, value, reg);rt2x00_print_chip (rt2x00dev); -if (!rt2x00_rf (&rt2x00dev->chip,RF5225 ) && - !rt2x00_rf (&rt2x00dev->chip,RF5325 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2527 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2529 )) { +if (!rt2x00_rf (rt2x00dev,RF5225 ) && + !rt2x00_rf (rt2x00dev,RF5325 ) && + !rt2x00_rf (rt2x00dev,RF2527 ) && + !rt2x00_rf (rt2x00dev,RF2529 )) {ERROR (rt2x00dev,"Invalid RF chipset detected.\n" );return -ENODEV ; }
@@ -2360,7 +2356,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)* the antenna settings should be gathered from the NIC * eeprom word. */ -if (rt2x00_rf (&rt2x00dev->chip,RF2529 ) && +if (rt2x00_rf (rt2x00dev,RF2529 ) && !test_bit (CONFIG_DOUBLE_ANTENNA , &rt2x00dev->flags)) { rt2x00dev->default_ant.rx =ANTENNA_A +rt2x00_get_field16 (eeprom,EEPROM_NIC_RX_FIXED );
@@ -2571,8 +2567,7 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) spec->channels = rf_vals_seq; } -if (rt2x00_rf (&rt2x00dev->chip,RF5225 ) || -rt2x00_rf (&rt2x00dev->chip,RF5325 )) { +if (rt2x00_rf (rt2x00dev,RF5225 ) ||rt2x00_rf (rt2x00dev,RF5325 )) { spec->supported_bands |=SUPPORT_BAND_5GHZ ; spec->num_channels =ARRAY_SIZE (rf_vals_seq); }
drivers/net/wireless/rt2x00/rt73usb.c +16 -20
@@ -136,8 +136,8 @@ static void rt73usb_rf_write(struct rt2x00_dev *rt2x00dev,* all others contain 20 bits. */ rt2x00_set_field32 (®,PHY_CSR4_NUMBER_OF_BITS , -20 + (rt2x00_rf (&rt2x00dev->chip,RF5225 ) || -rt2x00_rf (&rt2x00dev->chip,RF2527 ))); +20 + (rt2x00_rf (rt2x00dev,RF5225 ) || +rt2x00_rf (rt2x00dev,RF2527 )));rt2x00_set_field32 (®,PHY_CSR4_IF_SELECT ,0 );rt2x00_set_field32 (®,PHY_CSR4_BUSY ,1 );
@@ -741,11 +741,9 @@ static void rt73usb_config_ant(struct rt2x00_dev *rt2x00dev,rt2x00usb_register_write (rt2x00dev,PHY_CSR0 , reg); -if (rt2x00_rf (&rt2x00dev->chip,RF5226 ) || -rt2x00_rf (&rt2x00dev->chip,RF5225 )) +if (rt2x00_rf (rt2x00dev,RF5226 ) ||rt2x00_rf (rt2x00dev,RF5225 ))rt73usb_config_antenna_5x (rt2x00dev, ant); -else if (rt2x00_rf (&rt2x00dev->chip,RF2528 ) || -rt2x00_rf (&rt2x00dev->chip,RF2527 )) +else if (rt2x00_rf (rt2x00dev,RF2528 ) ||rt2x00_rf (rt2x00dev,RF2527 ))rt73usb_config_antenna_2x (rt2x00dev, ant); }
@@ -779,8 +777,7 @@ static void rt73usb_config_channel(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (&rf->rf3,RF3_TXPOWER ,TXPOWER_TO_DEV (txpower));rt2x00_set_field32 (&rf->rf4,RF4_FREQ_OFFSET , rt2x00dev->freq_offset); - smart = !(rt2x00_rf (&rt2x00dev->chip,RF5225 ) || -rt2x00_rf (&rt2x00dev->chip,RF2527 )); + smart = !(rt2x00_rf (rt2x00dev,RF5225 ) ||rt2x00_rf (rt2x00dev,RF2527 ));rt73usb_bbp_read (rt2x00dev,3 , &r3);rt2x00_set_field8 (&r3,BBP_R3_SMART_MODE , smart);
@@ -1210,8 +1207,7 @@ static int rt73usb_init_registers(struct rt2x00_dev *rt2x00dev)rt2x00usb_register_write (rt2x00dev,SEC_CSR5 ,0x00000000 ); reg =0x000023b0 ; -if (rt2x00_rf (&rt2x00dev->chip,RF5225 ) || -rt2x00_rf (&rt2x00dev->chip,RF2527 )) +if (rt2x00_rf (rt2x00dev,RF5225 ) ||rt2x00_rf (rt2x00dev,RF2527 ))rt2x00_set_field32 (®,PHY_CSR1_RF_RPI ,1 );rt2x00usb_register_write (rt2x00dev,PHY_CSR1 , reg);
@@ -1827,16 +1823,16 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)rt2x00_set_chip (rt2x00dev,RT2571 , value, reg);rt2x00_print_chip (rt2x00dev); -if (!rt2x00_check_rev (&rt2x00dev->chip,0x000ffff0 ,0x25730 ) || -rt2x00_check_rev (&rt2x00dev->chip,0x0000000f ,0 )) { +if (!rt2x00_check_rev (rt2x00dev,0x000ffff0 ,0x25730 ) || +rt2x00_check_rev (rt2x00dev,0x0000000f ,0 )) {ERROR (rt2x00dev,"Invalid RT chipset detected.\n" );return -ENODEV ; } -if (!rt2x00_rf (&rt2x00dev->chip,RF5226 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2528 ) && - !rt2x00_rf (&rt2x00dev->chip,RF5225 ) && - !rt2x00_rf (&rt2x00dev->chip,RF2527 )) { +if (!rt2x00_rf (rt2x00dev,RF5226 ) && + !rt2x00_rf (rt2x00dev,RF2528 ) && + !rt2x00_rf (rt2x00dev,RF5225 ) && + !rt2x00_rf (rt2x00dev,RF2527 )) {ERROR (rt2x00dev,"Invalid RF chipset detected.\n" );return -ENODEV ; }
@@ -2081,17 +2077,17 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) spec->supported_bands =SUPPORT_BAND_2GHZ ; spec->supported_rates =SUPPORT_RATE_CCK |SUPPORT_RATE_OFDM ; -if (rt2x00_rf (&rt2x00dev->chip,RF2528 )) { +if (rt2x00_rf (rt2x00dev,RF2528 )) { spec->num_channels =ARRAY_SIZE (rf_vals_bg_2528); spec->channels = rf_vals_bg_2528; - }else if (rt2x00_rf (&rt2x00dev->chip,RF5226 )) { + }else if (rt2x00_rf (rt2x00dev,RF5226 )) { spec->supported_bands |=SUPPORT_BAND_5GHZ ; spec->num_channels =ARRAY_SIZE (rf_vals_5226); spec->channels = rf_vals_5226; - }else if (rt2x00_rf (&rt2x00dev->chip,RF2527 )) { + }else if (rt2x00_rf (rt2x00dev,RF2527 )) { spec->num_channels =14 ; spec->channels = rf_vals_5225_2527; - }else if (rt2x00_rf (&rt2x00dev->chip,RF5225 )) { + }else if (rt2x00_rf (rt2x00dev,RF5225 )) { spec->supported_bands |=SUPPORT_BAND_5GHZ ; spec->num_channels =ARRAY_SIZE (rf_vals_5225_2527); spec->channels = rf_vals_5225_2527;
Signature · 1 line
1.6.5.7
Re: [PATCH 5/5] rt2x00: Cleanup chip handling helper functions.
Quoted 6 lines · Gertjan van Wingerde
Let each of them take a struct
rt2x00_devpointer as argument instead of a mixture of structrt2x00_chipand structrt2x00_devpointers. Preparation for further clean ups in the rt2x00 chip handling, especially for rt2800 devices.Signed-off-by Gertjan van Wingerde <[email protected]>
Re: [PATCH 4/5] rt2x00: convert RT2800PCI_PCI and RT2800PCI_SOC Kconfig symbols to booleans.
In reply to Gertjan van WingerdeQuoted 5 lines · Gertjan van Wingerde
There is no need for
KconfigsymbolsRT2800PCI_PCIandRT2800PCI_SOCto be tristates, as they are only used to check whether RT2800 PCI or SOC support is to be compiled in.Signed-off-by Gertjan van Wingerde <[email protected]>
Re: [PATCH 3/5] rt2x00: Let rt2800lib check CONFIG_RT2X00_LIB_USB instead of CONFIG_RT2800USB
In reply to Gertjan van WingerdeQuoted 6 lines · Gertjan van Wingerde
rt2800lib currently checks whether RT2800USB is enabled in the configuration. Strictly speaking this is not necessary, it only needs to know whether the generic rt2x00usb library functions are available. Therefore check for
RT2X00_LIB_USBinstead.Signed-off-by Gertjan van Wingerde <[email protected]>
Re: [PATCH 2/5] rt2x00: Fix checks for rt2800 SOC support.
In reply to Gertjan van WingerdeQuoted 4 lines · Gertjan van Wingerde
Fix checking for SOC support in rt2800pci. The wrong config (an unexisting one) was checked.
Signed-off-by Gertjan van Wingerde <[email protected]>
Quoted 3 lines
--- drivers/net/wireless/rt2x00/rt2800pci.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
Re: [PATCH 1/5] rt2x00: Add USB ID for Linksys WUSB 600N rev 2.
In reply to Gertjan van WingerdeQuoted 3 lines · Gertjan van Wingerde
This is a rt2870 based device.
Signed-off-by Gertjan van Wingerde <[email protected]>
Quoted 16 lines
--- drivers/net/wireless/rt2x00/rt2800usb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/net/wireless/rt2x00/rt2800usb.c +1
-0@@ -933,6 +933,7 @@ static struct usb_device_id rt2800usb_device_table[] = { { USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x1737, 0x0077), USB_DEVICE_DATA(&rt2800usb_ops) }, + { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },/* Logitec */ { USB_DEVICE(0x0789, 0x0162), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x0789, 0x0163), USB_DEVICE_DATA(&rt2800usb_ops) },