COSA/SRP: Convert channel_data.rsem to mutex
PATCH 1/1 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 <[email protected]>
--
drivers/net/wan/cosa.c +8 -6
@@ -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 @@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 void chardev_channel_init (struct channel_data *chan) { -init_MUTEX (&chan->rsem); +mutex_init (&chan->rlock);init_MUTEX (&chan->wsem); }
@@ -825,12 +827,12 @@ 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 @@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 @@ 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);
Signature · 10 lines
Matthias Kaehlcke
Linux System Developer
Barcelona
Nothing is more despicable than respect based on fear
(Albert Camus)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-