Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6387c4be authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by David S. Miller
Browse files

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: default avatarMatthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee6b9673

drivers/net/wan/cosa.c

+8 −6
Original line number Diff line number Diff line
@@ -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);