aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/io.c')
-rw-r--r--drivers/net/wireless/wl12xx/io.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/wl12xx/io.c
index c2da66f4504..079ad380e8f 100644
--- a/drivers/net/wireless/wl12xx/io.c
+++ b/drivers/net/wireless/wl12xx/io.c
@@ -24,8 +24,10 @@
24#include <linux/module.h> 24#include <linux/module.h>
25#include <linux/platform_device.h> 25#include <linux/platform_device.h>
26#include <linux/spi/spi.h> 26#include <linux/spi/spi.h>
27#include <linux/interrupt.h>
27 28
28#include "wl12xx.h" 29#include "wl12xx.h"
30#include "debug.h"
29#include "wl12xx_80211.h" 31#include "wl12xx_80211.h"
30#include "io.h" 32#include "io.h"
31#include "tx.h" 33#include "tx.h"
@@ -46,7 +48,7 @@
46bool wl1271_set_block_size(struct wl1271 *wl) 48bool wl1271_set_block_size(struct wl1271 *wl)
47{ 49{
48 if (wl->if_ops->set_block_size) { 50 if (wl->if_ops->set_block_size) {
49 wl->if_ops->set_block_size(wl, WL12XX_BUS_BLOCK_SIZE); 51 wl->if_ops->set_block_size(wl->dev, WL12XX_BUS_BLOCK_SIZE);
50 return true; 52 return true;
51 } 53 }
52 54
@@ -55,12 +57,12 @@ bool wl1271_set_block_size(struct wl1271 *wl)
55 57
56void wl1271_disable_interrupts(struct wl1271 *wl) 58void wl1271_disable_interrupts(struct wl1271 *wl)
57{ 59{
58 wl->if_ops->disable_irq(wl); 60 disable_irq(wl->irq);
59} 61}
60 62
61void wl1271_enable_interrupts(struct wl1271 *wl) 63void wl1271_enable_interrupts(struct wl1271 *wl)
62{ 64{
63 wl->if_ops->enable_irq(wl); 65 enable_irq(wl->irq);
64} 66}
65 67
66/* Set the SPI partitions to access the chip addresses 68/* Set the SPI partitions to access the chip addresses
@@ -128,13 +130,13 @@ EXPORT_SYMBOL_GPL(wl1271_set_partition);
128void wl1271_io_reset(struct wl1271 *wl) 130void wl1271_io_reset(struct wl1271 *wl)
129{ 131{
130 if (wl->if_ops->reset) 132 if (wl->if_ops->reset)
131 wl->if_ops->reset(wl); 133 wl->if_ops->reset(wl->dev);
132} 134}
133 135
134void wl1271_io_init(struct wl1271 *wl) 136void wl1271_io_init(struct wl1271 *wl)
135{ 137{
136 if (wl->if_ops->init) 138 if (wl->if_ops->init)
137 wl->if_ops->init(wl); 139 wl->if_ops->init(wl->dev);
138} 140}
139 141
140void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val) 142void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val)