diff options
| author | Matthias Kaehlcke <matthias@kaehlcke.net> | 2008-03-05 18:53:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 18:53:01 -0800 |
| commit | 6387c4bed539539b05fa773cf2ff26529dc3074c (patch) | |
| tree | 5b96e7489fe45e08a4442ccf97148ad8ad8632f8 | |
| parent | ee6b967301b4aa5d4a4b61e2f682f086266db9fb (diff) | |
COSA/SRP: convert channel_data.rsem to mutex
COSA/SRP driver: The semaphore channel_data.rsem is used as a mutex,
convert it to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/wan/cosa.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 1d706eae305..45ddfc9763c 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -90,6 +90,7 @@ #include <linux/ioport.h> #include <linux/netdevice.h> #include <linux/spinlock.h> +#include <linux/mutex.h> #include <linux/device.h> #undef COSA_SLOW_IO /* for testing purposes only */ @@ -127,7 +128,8 @@ struct channel_data { int (*tx_done)(struct channel_data *channel, int size); /* Character device parts */ - struct semaphore rsem, wsem; + struct mutex rlock; + struct semaphore wsem; char *rxdata; int rxsize; wait_queue_head_t txwaitq, rxwaitq; @@ -807,7 +809,7 @@ static struct net_device_stats *cosa_net_stats(struct net_device *dev) static void chardev_channel_init(struct channel_data *chan) { - init_MUTEX(&chan->rsem); + mutex_init(&chan->rlock); init_MUTEX(&chan->wsem); } @@ -825,12 +827,12 @@ static ssize_t cosa_read(struct file *file, cosa->name, cosa->firmware_status); return -EPERM; } - if (down_interruptible(&chan->rsem)) + if (mutex_lock_interruptible(&chan->rlock)) return -ERESTARTSYS; if ((chan->rxdata = kmalloc(COSA_MTU, GFP_DMA|GFP_KERNEL)) == NULL) { printk(KERN_INFO "%s: cosa_read() - OOM\n", cosa->name); - up(&chan->rsem); + mutex_unlock(&chan->rlock); return -ENOMEM; } @@ -848,7 +850,7 @@ static ssize_t cosa_read(struct file *file, remove_wait_queue(&chan->rxwaitq, &wait); current->state = TASK_RUNNING; spin_unlock_irqrestore(&cosa->lock, flags); - up(&chan->rsem); + mutex_unlock(&chan->rlock); return -ERESTARTSYS; } } @@ -857,7 +859,7 @@ static ssize_t cosa_read(struct file *file, kbuf = chan->rxdata; count = chan->rxsize; spin_unlock_irqrestore(&cosa->lock, flags); - up(&chan->rsem); + mutex_unlock(&chan->rlock); if (copy_to_user(buf, kbuf, count)) { kfree(kbuf); |