[PATCH] rt2x00: Small optimizations
Make some small optimizations by removing some simple if-statements. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
5cbf830e13
commit
4f5af6eb3d
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue