[PATCH] rt2x00: Small optimizations

[Linux Kernel Mailing List]

Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4f5af6eb3d17f8e343597ea99d97eb2f2905b2fb
Commit:     4f5af6eb3d17f8e343597ea99d97eb2f2905b2fb
Parent:     5cbf830e137d1b6057cb6b553a8ebbb7d1b9343f
Author:     Ivo van Doorn <[EMAIL PROTECTED]>
AuthorDate: Sat Oct 6 14:16:30 2007 +0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:55:15 2007 -0700

    [PATCH] rt2x00: Small optimizations
    
    Make some small optimizations by removing
    some simple if-statements.
    
    Signed-off-by: Ivo van Doorn <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/rt2x00/rt2500usb.c |    6 ++----
 drivers/net/wireless/rt2x00/rt61pci.c   |    6 ++----
 drivers/net/wireless/rt2x00/rt73usb.c   |   19 +++++++++----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c 
b/drivers/net/wireless/rt2x00/rt2500usb.c
index f536ff1..ef8dffb 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -326,10 +326,8 @@ static void rt2500usb_config_rate(struct rt2x00_dev 
*rt2x00dev, const int rate)
        rt2500usb_register_write(rt2x00dev, TXRX_CSR1, reg);
 
        rt2500usb_register_read(rt2x00dev, TXRX_CSR10, &reg);
-       if (preamble == SHORT_PREAMBLE)
-               rt2x00_set_field16(&reg, TXRX_CSR10_AUTORESPOND_PREAMBLE, 1);
-       else
-               rt2x00_set_field16(&reg, TXRX_CSR10_AUTORESPOND_PREAMBLE, 0);
+       rt2x00_set_field16(&reg, TXRX_CSR10_AUTORESPOND_PREAMBLE,
+                          (preamble == SHORT_PREAMBLE));
        rt2500usb_register_write(rt2x00dev, TXRX_CSR10, reg);
 }
 
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c 
b/drivers/net/wireless/rt2x00/rt61pci.c
index 8011523..cd22817 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -357,10 +357,8 @@ static void rt61pci_config_rate(struct rt2x00_dev 
*rt2x00dev, const int rate)
        rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
 
        rt2x00pci_register_read(rt2x00dev, TXRX_CSR4, &reg);
-       if (preamble == SHORT_PREAMBLE)
-               rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE, 1);
-       else
-               rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE, 0);
+       rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE,
+                          (preamble == SHORT_PREAMBLE));
        rt2x00pci_register_write(rt2x00dev, TXRX_CSR4, reg);
 }
 
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c 
b/drivers/net/wireless/rt2x00/rt73usb.c
index 4a78ca7..9e1bf4d 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -195,12 +195,13 @@ rf_write:
        reg = 0;
        rt2x00_set_field32(&reg, PHY_CSR4_VALUE, value);
 
-       if (rt2x00_rf(&rt2x00dev->chip, RF5225) ||
-           rt2x00_rf(&rt2x00dev->chip, RF2527))
-               rt2x00_set_field32(&reg, PHY_CSR4_NUMBER_OF_BITS, 21);
-       else
-               rt2x00_set_field32(&reg, PHY_CSR4_NUMBER_OF_BITS, 20);
-
+       /*
+        * RF5225 and RF2527 contain 21 bits per RF register value,
+        * all others contain 20 bits.
+        */
+       rt2x00_set_field32(&reg, PHY_CSR4_NUMBER_OF_BITS,
+                          20 + !!(rt2x00_rf(&rt2x00dev->chip, RF5225) ||
+                                  rt2x00_rf(&rt2x00dev->chip, RF2527)));
        rt2x00_set_field32(&reg, PHY_CSR4_IF_SELECT, 0);
        rt2x00_set_field32(&reg, PHY_CSR4_BUSY, 1);
 
@@ -331,10 +332,8 @@ static void rt73usb_config_rate(struct rt2x00_dev 
*rt2x00dev, const int rate)
        rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
 
        rt73usb_register_read(rt2x00dev, TXRX_CSR4, &reg);
-       if (preamble == SHORT_PREAMBLE)
-               rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE, 1);
-       else
-               rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE, 0);
+       rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE,
+                          (preamble == SHORT_PREAMBLE));
        rt73usb_register_write(rt2x00dev, TXRX_CSR4, reg);
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html