[PATCH] rt2x00: Cleanup if-statements

Cleanup if-statements for simple 1/0 register field values.

This also fixes a endian bug in rt2500usb when working
with the PHY_CSR2 initialization. As well as a bug
in the enabling of the LED in rt73usb.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 18 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 958b148d8f50..869b1a7cec73 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -563,18 +563,10 @@ static void rt2500pci_enable_led(struct rt2x00_dev *rt2x00dev)
 
         rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);
         rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);
-
-        if (rt2x00dev->led_mode == LED_MODE_TXRX_ACTIVITY) {
-                rt2x00_set_field32(&reg, LEDCSR_LINK, 1);
-                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, 0);
-        } else if (rt2x00dev->led_mode == LED_MODE_ASUS) {
-                rt2x00_set_field32(&reg, LEDCSR_LINK, 0);
-                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, 1);
-        } else {
-                rt2x00_set_field32(&reg, LEDCSR_LINK, 1);
-                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, 1);
-        }
-
+        rt2x00_set_field32(&reg, LEDCSR_LINK,
+                           (rt2x00dev->led_mode != LED_MODE_ASUS));
+        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY,
+                           (rt2x00dev->led_mode != LED_MODE_TXRX_ACTIVITY));
         rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
 }
 
@@ -1244,12 +1236,12 @@ static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
         }
 
         rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
-        if (queue == IEEE80211_TX_QUEUE_DATA0)
-                rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, 1);
-        else if (queue == IEEE80211_TX_QUEUE_DATA1)
-                rt2x00_set_field32(&reg, TXCSR0_KICK_TX, 1);
-        else if (queue == IEEE80211_TX_QUEUE_AFTER_BEACON)
-                rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, 1);
+        rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO,
+                           (queue == IEEE80211_TX_QUEUE_DATA0));
+        rt2x00_set_field32(&reg, TXCSR0_KICK_TX,
+                           (queue == IEEE80211_TX_QUEUE_DATA1));
+        rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM,
+                           (queue == IEEE80211_TX_QUEUE_AFTER_BEACON));
         rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
 }