diff options
| author | David Kilroy <kilroyd@googlemail.com> | 2010-05-01 14:05:40 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:07 -0400 |
| commit | bcad6e80f3fb0d6724c3814cf32258bbcf1d67db (patch) | |
| tree | 13fc2edae79405b7ae393099486153eefa3091d1 /drivers/net/wireless/orinoco/orinoco_cs.c | |
| parent | 593ef09c9e70c92c0d76c67a1c03a5d44d3aec82 (diff) | |
| download | olio-linux-3.10-bcad6e80f3fb0d6724c3814cf32258bbcf1d67db.tar.xz olio-linux-3.10-bcad6e80f3fb0d6724c3814cf32258bbcf1d67db.zip | |
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/orinoco_cs.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 525f74e6829..f99b13ba92b 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c @@ -327,9 +327,9 @@ orinoco_cs_release(struct pcmcia_device *link) /* We're committed to taking the device away now, so mark the * hardware as unavailable */ - spin_lock_irqsave(&priv->lock, flags); + priv->hw.ops->lock_irqsave(&priv->lock, &flags); priv->hw_unavailable++; - spin_unlock_irqrestore(&priv->lock, flags); + priv->hw.ops->unlock_irqrestore(&priv->lock, &flags); pcmcia_disable_device(link); if (priv->hw.iobase) |