From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, rt2400-devel@lists.sourceforge.net
Subject: [PATCH 12/16] rt2x00: Small optimizations
Date: Sat, 6 Oct 2007 14:16:30 +0200 [thread overview]
Message-ID: <200710061416.30696.IvDoorn@gmail.com> (raw)
In-Reply-To: <200710061410.31765.IvDoorn@gmail.com>
Make some small optimizations by removing
some simple if-statements.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
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 c4aa466..480527f 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, ®);
- if (preamble == SHORT_PREAMBLE)
- rt2x00_set_field16(®, TXRX_CSR10_AUTORESPOND_PREAMBLE, 1);
- else
- rt2x00_set_field16(®, TXRX_CSR10_AUTORESPOND_PREAMBLE, 0);
+ rt2x00_set_field16(®, 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 b9051a1..e250f0a 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, ®);
- if (preamble == SHORT_PREAMBLE)
- rt2x00_set_field32(®, TXRX_CSR4_AUTORESPOND_PREAMBLE, 1);
- else
- rt2x00_set_field32(®, TXRX_CSR4_AUTORESPOND_PREAMBLE, 0);
+ rt2x00_set_field32(®, 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 7cfdf65..d3c57a4 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(®, PHY_CSR4_VALUE, value);
- if (rt2x00_rf(&rt2x00dev->chip, RF5225) ||
- rt2x00_rf(&rt2x00dev->chip, RF2527))
- rt2x00_set_field32(®, PHY_CSR4_NUMBER_OF_BITS, 21);
- else
- rt2x00_set_field32(®, PHY_CSR4_NUMBER_OF_BITS, 20);
-
+ /*
+ * RF5225 and RF2527 contain 21 bits per RF register value,
+ * all others contain 20 bits.
+ */
+ rt2x00_set_field32(®, PHY_CSR4_NUMBER_OF_BITS,
+ 20 + !!(rt2x00_rf(&rt2x00dev->chip, RF5225) ||
+ rt2x00_rf(&rt2x00dev->chip, RF2527)));
rt2x00_set_field32(®, PHY_CSR4_IF_SELECT, 0);
rt2x00_set_field32(®, 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, ®);
- if (preamble == SHORT_PREAMBLE)
- rt2x00_set_field32(®, TXRX_CSR4_AUTORESPOND_PREAMBLE, 1);
- else
- rt2x00_set_field32(®, TXRX_CSR4_AUTORESPOND_PREAMBLE, 0);
+ rt2x00_set_field32(®, TXRX_CSR4_AUTORESPOND_PREAMBLE,
+ (preamble == SHORT_PREAMBLE));
rt73usb_register_write(rt2x00dev, TXRX_CSR4, reg);
}
--
1.5.3.4
next prev parent reply other threads:[~2007-10-06 12:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200710061410.31765.IvDoorn@gmail.com>
2007-10-06 12:11 ` [PATCH 01/16] rt2x00: Remove duplicate code in MAC & BSSID handling Ivo van Doorn
2007-10-06 12:12 ` [PATCH 02/16] rt2x00: Remove radio check from rt2x00lib_toggle_rx Ivo van Doorn
2007-10-06 12:12 ` [PATCH 03/16] rt2x00: Store "STARTED" state during suspend Ivo van Doorn
2007-10-06 12:13 ` [PATCH 04/16] rt2x00: Move rt2x00dev flags into enumeration Ivo van Doorn
2007-10-06 12:13 ` [PATCH 05/16] rt2x00: Don't use changed_flags inside configure_packet_filter Ivo van Doorn
2007-10-06 12:14 ` [PATCH 06/16] rt2x00: Fix rfkill handling Ivo van Doorn
2007-10-06 12:14 ` [PATCH 07/16] rt2x00: Move TSF sync values into rt2x00config Ivo van Doorn
2007-10-06 12:14 ` [PATCH 08/16] rt2x00: get_duration expects values in 100kbs Ivo van Doorn
2007-10-06 12:15 ` [PATCH 09/16] rt2x00: Cut lines down to 80 characters Ivo van Doorn
2007-10-06 12:15 ` [PATCH 10/16] rt2x00: Add get_tx_data_len callback function Ivo van Doorn
2007-10-06 12:16 ` [PATCH 11/16] rt2x00: Pass dev_state to rt2x00lib_toggle_rx Ivo van Doorn
2007-10-06 12:16 ` Ivo van Doorn [this message]
2007-10-06 12:17 ` [PATCH 13/16] rt2x00: Reorganize configuration handler Ivo van Doorn
2007-10-06 12:18 ` [PATCH 14/16] rt2x00: Clean disabling of rt73usb_get_tsf Ivo van Doorn
2007-10-06 12:18 ` [PATCH 15/16] rt2x00: Allways memset memory obtained from skb_push() Ivo van Doorn
2007-10-06 12:18 ` [PATCH 16/16] rt2x00: Release 2.0.10 Ivo van Doorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200710061416.30696.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rt2400-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.