dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

rt2800usb: add rt2800_rf_[read,write]() wrappers 

Part of preparations for later code unification.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-11-04 18:34:18 +01:00 committed by John W. Linville
parent 1af68f75a8
commit 5c70e5bb36
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/wireless/rt2x00/rt2800usb.c
View File

@ -226,6 +226,12 @@ static void rt2800usb_rf_write(struct rt2x00_dev *rt2x00dev,
mutex_unlock(&rt2x00dev->csr_mutex);
}
static inline void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
const unsigned int word, const u32 value)
{
rt2800usb_rf_write(rt2x00dev, word, value);
}
static void rt2800usb_mcu_request(struct rt2x00_dev *rt2x00dev,
const u8 command, const u8 token,
const u8 arg0, const u8 arg1)
@ -280,7 +286,7 @@ static const struct rt2x00debug rt2800usb_rt2x00debug = {
},
.rf = {
.read = rt2x00_rf_read,
.write = rt2800usb_rf_write,
.write = rt2800_rf_write,
.word_base = RF_BASE,
.word_size = sizeof(u32),
.word_count = RF_SIZE / sizeof(u32),
@ -747,24 +753,24 @@ static void rt2800usb_config_channel_rt2x(struct rt2x00_dev *rt2x00dev,
rt2x00_set_field32(&rf->rf4, RF4_HT40, conf_is_ht40(conf));
rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
rt2800_rf_write(rt2x00dev, 1, rf->rf1);
rt2800_rf_write(rt2x00dev, 2, rf->rf2);
rt2800_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800_rf_write(rt2x00dev, 4, rf->rf4);
udelay(200);
rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 | 0x00000004);
rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
rt2800_rf_write(rt2x00dev, 1, rf->rf1);
rt2800_rf_write(rt2x00dev, 2, rf->rf2);
rt2800_rf_write(rt2x00dev, 3, rf->rf3 | 0x00000004);
rt2800_rf_write(rt2x00dev, 4, rf->rf4);
udelay(200);
rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
rt2800_rf_write(rt2x00dev, 1, rf->rf1);
rt2800_rf_write(rt2x00dev, 2, rf->rf2);
rt2800_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800_rf_write(rt2x00dev, 4, rf->rf4);
}
static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev,