summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/airport.c
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2010-05-01 14:05:40 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-05-03 14:53:07 -0400
commitbcad6e80f3fb0d6724c3814cf32258bbcf1d67db (patch)
tree13fc2edae79405b7ae393099486153eefa3091d1 /drivers/net/wireless/orinoco/airport.c
parent593ef09c9e70c92c0d76c67a1c03a5d44d3aec82 (diff)
downloadop-kernel-dev-bcad6e80f3fb0d6724c3814cf32258bbcf1d67db.zip
op-kernel-dev-bcad6e80f3fb0d6724c3814cf32258bbcf1d67db.tar.gz
orinoco: encapsulate driver locking
Local bus and USB drivers will need to do locking differently. The original orinoco_usb patches had a boolean variable controlling whether spin_lock_bh was used, or irq based locking. This version provides wrappers for the lock functions and the drivers specify the functions pointers needed. This will introduce a performance penalty, but I'm not expecting it to be noticable. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/airport.c')
-rw-r--r--drivers/net/wireless/orinoco/airport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c
index 7dac5ad..9bcee10 100644
--- a/drivers/net/wireless/orinoco/airport.c
+++ b/drivers/net/wireless/orinoco/airport.c
@@ -77,9 +77,9 @@ airport_resume(struct macio_dev *mdev)
enable_irq(card->irq);
- spin_lock_irqsave(&priv->lock, flags);
+ priv->hw.ops->lock_irqsave(&priv->lock, &flags);
err = orinoco_up(priv);
- spin_unlock_irqrestore(&priv->lock, flags);
+ priv->hw.ops->unlock_irqrestore(&priv->lock, &flags);
return err;
}
OpenPOWER on IntegriCloud