diff options
author | Kalle Valo <kalle.valo@nokia.com> | 2009-08-07 06:33:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:38 -0400 |
commit | 0e71bb084adc4986b9a4be3581897f0ee703cbd5 (patch) | |
tree | 88c0fece109d88cdcd7a24e077b46bff5941327d /drivers/net/wireless/wl12xx/wl1251_cmd.c | |
parent | b5ed9c1b6f8fcb2d2315f12599fd5808f7933f16 (diff) |
wl1251: remove wl1251_ops
Now wl1271 is splitted to separate files, no need to use wl1251_ops anymore.
So remove struct wl1251_chip and wl1251_ops.c.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_cmd.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c index dfbf6811976..53f5da65bcb 100644 --- a/drivers/net/wireless/wl12xx/wl1251_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c | |||
@@ -37,7 +37,7 @@ int wl1251_cmd_send(struct wl1251 *wl, u16 id, void *buf, size_t len) | |||
37 | timeout = jiffies + msecs_to_jiffies(WL1251_COMMAND_TIMEOUT); | 37 | timeout = jiffies + msecs_to_jiffies(WL1251_COMMAND_TIMEOUT); |
38 | 38 | ||
39 | intr = wl1251_reg_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR); | 39 | intr = wl1251_reg_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR); |
40 | while (!(intr & wl->chip.intr_cmd_complete)) { | 40 | while (!(intr & WL1251_ACX_INTR_CMD_COMPLETE)) { |
41 | if (time_after(jiffies, timeout)) { | 41 | if (time_after(jiffies, timeout)) { |
42 | wl1251_error("command complete timeout"); | 42 | wl1251_error("command complete timeout"); |
43 | ret = -ETIMEDOUT; | 43 | ret = -ETIMEDOUT; |
@@ -50,7 +50,7 @@ int wl1251_cmd_send(struct wl1251 *wl, u16 id, void *buf, size_t len) | |||
50 | } | 50 | } |
51 | 51 | ||
52 | wl1251_reg_write32(wl, ACX_REG_INTERRUPT_ACK, | 52 | wl1251_reg_write32(wl, ACX_REG_INTERRUPT_ACK, |
53 | wl->chip.intr_cmd_complete); | 53 | WL1251_ACX_INTR_CMD_COMPLETE); |
54 | 54 | ||
55 | out: | 55 | out: |
56 | return ret; | 56 | return ret; |