summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/cw1200
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2013-10-25 18:15:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-12-05 14:54:47 -0500
commitcf1ad8f94766a22b55f6515ac28b8edb0504e1d6 (patch)
tree9e07f4f66846324df98df806daa33c92803ddd47 /drivers/net/wireless/cw1200
parent809c5255d87580d14ad746f059f73231d94b50a7 (diff)
downloadblackbird-op-linux-cf1ad8f94766a22b55f6515ac28b8edb0504e1d6.tar.gz
blackbird-op-linux-cf1ad8f94766a22b55f6515ac28b8edb0504e1d6.zip
wireless: cw1200: Use consistent internal locking conventions
The cw1200_irq_handler() function expects the hwbus lock to be held when it is called. On the SDIO platform, this lock is implemented in terms of sdio_claim_host/sdio_release_host. This trivial patch makes it explicit that we are performing the hwbus lock rather than something SDIO-specific. Signed-off-by: Solomon Peachy <pizza@shaftnet.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/cw1200')
-rw-r--r--drivers/net/wireless/cw1200/cw1200_sdio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/cw1200/cw1200_sdio.c b/drivers/net/wireless/cw1200/cw1200_sdio.c
index ebdcdf44f155..d3acc85932a5 100644
--- a/drivers/net/wireless/cw1200/cw1200_sdio.c
+++ b/drivers/net/wireless/cw1200/cw1200_sdio.c
@@ -108,9 +108,9 @@ static irqreturn_t cw1200_gpio_irq(int irq, void *dev_id)
struct hwbus_priv *self = dev_id;
if (self->core) {
- sdio_claim_host(self->func);
+ cw1200_sdio_lock(self);
cw1200_irq_handler(self->core);
- sdio_release_host(self->func);
+ cw1200_sdio_unlock(self);
return IRQ_HANDLED;
} else {
return IRQ_NONE;
OpenPOWER on IntegriCloud