diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-11-04 12:33:34 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-06 16:48:49 -0500 |
commit | ab209b9834d43ac7c01e803681c5c50c941e4de3 (patch) | |
tree | 47692bb319645aac00009f0fb5c23ec68be56ac8 /drivers/net/wireless/rt2x00/rt2800usb.c | |
parent | 4f2732ce8d02836b94299f64bc29b030545d654a (diff) |
rt2800usb: add rt2800_regbusy_read() wrapper
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>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index d7307b28a015..28d2e8b80105 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
@@ -58,14 +58,14 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption."); | |||
58 | * The _lock versions must be used if you already hold the csr_mutex | 58 | * The _lock versions must be used if you already hold the csr_mutex |
59 | */ | 59 | */ |
60 | #define WAIT_FOR_BBP(__dev, __reg) \ | 60 | #define WAIT_FOR_BBP(__dev, __reg) \ |
61 | rt2x00usb_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg)) | 61 | rt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg)) |
62 | #define WAIT_FOR_RFCSR(__dev, __reg) \ | 62 | #define WAIT_FOR_RFCSR(__dev, __reg) \ |
63 | rt2x00usb_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg)) | 63 | rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg)) |
64 | #define WAIT_FOR_RF(__dev, __reg) \ | 64 | #define WAIT_FOR_RF(__dev, __reg) \ |
65 | rt2x00usb_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg)) | 65 | rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg)) |
66 | #define WAIT_FOR_MCU(__dev, __reg) \ | 66 | #define WAIT_FOR_MCU(__dev, __reg) \ |
67 | rt2x00usb_regbusy_read((__dev), H2M_MAILBOX_CSR, \ | 67 | rt2800_regbusy_read((__dev), H2M_MAILBOX_CSR, \ |
68 | H2M_MAILBOX_CSR_OWNER, (__reg)) | 68 | H2M_MAILBOX_CSR_OWNER, (__reg)) |
69 | 69 | ||
70 | static void rt2800usb_bbp_write(struct rt2x00_dev *rt2x00dev, | 70 | static void rt2800usb_bbp_write(struct rt2x00_dev *rt2x00dev, |
71 | const unsigned int word, const u8 value) | 71 | const unsigned int word, const u8 value) |