diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/sdio.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c index f27e91502631..61fdc9e981bd 100644 --- a/drivers/net/wireless/wl12xx/sdio.c +++ b/drivers/net/wireless/wl12xx/sdio.c | |||
@@ -107,8 +107,6 @@ static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf, | |||
107 | int ret; | 107 | int ret; |
108 | struct sdio_func *func = wl_to_func(wl); | 108 | struct sdio_func *func = wl_to_func(wl); |
109 | 109 | ||
110 | sdio_claim_host(func); | ||
111 | |||
112 | if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) { | 110 | if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) { |
113 | ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret); | 111 | ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret); |
114 | wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x", | 112 | wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x", |
@@ -124,8 +122,6 @@ static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf, | |||
124 | wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len); | 122 | wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len); |
125 | } | 123 | } |
126 | 124 | ||
127 | sdio_release_host(func); | ||
128 | |||
129 | if (ret) | 125 | if (ret) |
130 | wl1271_error("sdio read failed (%d)", ret); | 126 | wl1271_error("sdio read failed (%d)", ret); |
131 | } | 127 | } |
@@ -136,8 +132,6 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf, | |||
136 | int ret; | 132 | int ret; |
137 | struct sdio_func *func = wl_to_func(wl); | 133 | struct sdio_func *func = wl_to_func(wl); |
138 | 134 | ||
139 | sdio_claim_host(func); | ||
140 | |||
141 | if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) { | 135 | if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) { |
142 | sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret); | 136 | sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret); |
143 | wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x", | 137 | wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x", |
@@ -153,8 +147,6 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf, | |||
153 | ret = sdio_memcpy_toio(func, addr, buf, len); | 147 | ret = sdio_memcpy_toio(func, addr, buf, len); |
154 | } | 148 | } |
155 | 149 | ||
156 | sdio_release_host(func); | ||
157 | |||
158 | if (ret) | 150 | if (ret) |
159 | wl1271_error("sdio write failed (%d)", ret); | 151 | wl1271_error("sdio write failed (%d)", ret); |
160 | } | 152 | } |
@@ -176,7 +168,6 @@ static int wl1271_sdio_power_on(struct wl1271 *wl) | |||
176 | 168 | ||
177 | sdio_claim_host(func); | 169 | sdio_claim_host(func); |
178 | sdio_enable_func(func); | 170 | sdio_enable_func(func); |
179 | sdio_release_host(func); | ||
180 | 171 | ||
181 | out: | 172 | out: |
182 | return ret; | 173 | return ret; |
@@ -187,7 +178,6 @@ static int wl1271_sdio_power_off(struct wl1271 *wl) | |||
187 | struct sdio_func *func = wl_to_func(wl); | 178 | struct sdio_func *func = wl_to_func(wl); |
188 | int ret; | 179 | int ret; |
189 | 180 | ||
190 | sdio_claim_host(func); | ||
191 | sdio_disable_func(func); | 181 | sdio_disable_func(func); |
192 | sdio_release_host(func); | 182 | sdio_release_host(func); |
193 | 183 | ||