aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2400pci.c
diff options
context:
space:
mode:
authorIvo van Doorn <IvDoorn@gmail.com>2010-11-06 10:48:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-11-15 13:26:35 -0500
commitea175ee26268370ca07aff91cf6ba1e0f1a3bd36 (patch)
treea678a381f91f6ac139101aa4d2091cd1073d7c65 /drivers/net/wireless/rt2x00/rt2400pci.c
parent8be4eed0ea7d8ef38692de878043a949e9db16e8 (diff)
rt2x00: Remove rt2x00lib_toggle_rx
As part of the queue refactoring, the rt2x00lib_toggle_rx can be removed and replaced with the call directly to the set_device_state callback function. We can remove the STATE_RADIO_RX_ON_LINK and STATE_RADIO_RX_OFF_LINK, as it was only used for special behavior inside rt2x00lib rather then the drivers. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2400pci.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index bc1ae1ebfdb0..9ec6691adf0d 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -885,8 +885,7 @@ static void rt2400pci_toggle_rx(struct rt2x00_dev *rt2x00dev,
885 885
886 rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg); 886 rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);
887 rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX, 887 rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX,
888 (state == STATE_RADIO_RX_OFF) || 888 (state == STATE_RADIO_RX_OFF));
889 (state == STATE_RADIO_RX_OFF_LINK));
890 rt2x00pci_register_write(rt2x00dev, RXCSR0, reg); 889 rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
891} 890}
892 891
@@ -989,9 +988,7 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev,
989 rt2400pci_disable_radio(rt2x00dev); 988 rt2400pci_disable_radio(rt2x00dev);
990 break; 989 break;
991 case STATE_RADIO_RX_ON: 990 case STATE_RADIO_RX_ON:
992 case STATE_RADIO_RX_ON_LINK:
993 case STATE_RADIO_RX_OFF: 991 case STATE_RADIO_RX_OFF:
994 case STATE_RADIO_RX_OFF_LINK:
995 rt2400pci_toggle_rx(rt2x00dev, state); 992 rt2400pci_toggle_rx(rt2x00dev, state);
996 break; 993 break;
997 case STATE_RADIO_IRQ_ON: 994 case STATE_RADIO_IRQ_ON: