diff options
author | Ivo van Doorn <IvDoorn@gmail.com> | 2010-11-06 10:48:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:26:35 -0500 |
commit | ea175ee26268370ca07aff91cf6ba1e0f1a3bd36 (patch) | |
tree | a678a381f91f6ac139101aa4d2091cd1073d7c65 /drivers/net/wireless/rt2x00/rt73usb.c | |
parent | 8be4eed0ea7d8ef38692de878043a949e9db16e8 (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/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 29602b5f01f..6f04552f581 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1331,8 +1331,7 @@ static void rt73usb_toggle_rx(struct rt2x00_dev *rt2x00dev, | |||
1331 | 1331 | ||
1332 | rt2x00usb_register_read(rt2x00dev, TXRX_CSR0, ®); | 1332 | rt2x00usb_register_read(rt2x00dev, TXRX_CSR0, ®); |
1333 | rt2x00_set_field32(®, TXRX_CSR0_DISABLE_RX, | 1333 | rt2x00_set_field32(®, TXRX_CSR0_DISABLE_RX, |
1334 | (state == STATE_RADIO_RX_OFF) || | 1334 | (state == STATE_RADIO_RX_OFF)); |
1335 | (state == STATE_RADIO_RX_OFF_LINK)); | ||
1336 | rt2x00usb_register_write(rt2x00dev, TXRX_CSR0, reg); | 1335 | rt2x00usb_register_write(rt2x00dev, TXRX_CSR0, reg); |
1337 | } | 1336 | } |
1338 | 1337 | ||
@@ -1403,9 +1402,7 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev, | |||
1403 | rt73usb_disable_radio(rt2x00dev); | 1402 | rt73usb_disable_radio(rt2x00dev); |
1404 | break; | 1403 | break; |
1405 | case STATE_RADIO_RX_ON: | 1404 | case STATE_RADIO_RX_ON: |
1406 | case STATE_RADIO_RX_ON_LINK: | ||
1407 | case STATE_RADIO_RX_OFF: | 1405 | case STATE_RADIO_RX_OFF: |
1408 | case STATE_RADIO_RX_OFF_LINK: | ||
1409 | rt73usb_toggle_rx(rt2x00dev, state); | 1406 | rt73usb_toggle_rx(rt2x00dev, state); |
1410 | break; | 1407 | break; |
1411 | case STATE_RADIO_IRQ_ON: | 1408 | case STATE_RADIO_IRQ_ON: |