dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: frontier: switch semaphores to mutexes 

This patch changes the use of semaphores in alphatrack.c and tranzport.c to
mutexes at the suggestion of checkpatch.pl

Signed-off-by: Eli Lindsey <eli@siliconsprawl.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eli Lindsey 2010-03-09 00:15:33 -06:00 committed by Greg Kroah-Hartman
parent b9eafe4380
commit 3504e0c878
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/frontier/alphatrack.c
View File

@ -134,7 +134,7 @@ MODULE_PARM_DESC(min_interrupt_out_interval,
/* Structure to hold all of our device specific stuff */ /* Structure to hold all of our device specific stuff */
struct usb_alphatrack { struct usb_alphatrack {
struct semaphore sem; /* locks this structure */ struct mutex mtx; /* locks this structure */
struct usb_interface *intf; /* save off the usb interface pointer */ struct usb_interface *intf; /* save off the usb interface pointer */
int open_count; /* number of times this port has been opened */ int open_count; /* number of times this port has been opened */
@ -347,7 +347,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
} }
/* lock this device */ /* lock this device */
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto unlock_disconnect_exit; goto unlock_disconnect_exit;
} }
@ -390,7 +390,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
file->private_data = dev; file->private_data = dev;
unlock_exit: unlock_exit:
up(&dev->sem); mutex_unlock(&dev->mtx);
unlock_disconnect_exit: unlock_disconnect_exit:
mutex_unlock(&disconnect_mutex); mutex_unlock(&disconnect_mutex);
@ -413,7 +413,7 @@ static int usb_alphatrack_release(struct inode *inode, struct file *file)
goto exit; goto exit;
} }
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
@ -425,7 +425,7 @@ static int usb_alphatrack_release(struct inode *inode, struct file *file)
if (dev->intf == NULL) { if (dev->intf == NULL) {
/* the device was unplugged before the file was released */ /* the device was unplugged before the file was released */
up(&dev->sem); mutex_unlock(&dev->mtx);
/* unlock here as usb_alphatrack_delete frees dev */ /* unlock here as usb_alphatrack_delete frees dev */
usb_alphatrack_delete(dev); usb_alphatrack_delete(dev);
retval = -ENODEV; retval = -ENODEV;
@ -441,7 +441,7 @@ static int usb_alphatrack_release(struct inode *inode, struct file *file)
dev->open_count = 0; dev->open_count = 0;
unlock_exit: unlock_exit:
up(&dev->sem); mutex_unlock(&dev->mtx);
exit: exit:
return retval; return retval;
@ -486,7 +486,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer,
goto exit; goto exit;
/* lock this object */ /* lock this object */
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
@ -532,7 +532,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer,
unlock_exit: unlock_exit:
/* unlock the device */ /* unlock the device */
up(&dev->sem); mutex_unlock(&dev->mtx);
exit: exit:
return retval; return retval;
@ -556,7 +556,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
goto exit; goto exit;
/* lock this object */ /* lock this object */
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
@ -627,7 +627,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
unlock_exit: unlock_exit:
/* unlock the device */ /* unlock the device */
up(&dev->sem); mutex_unlock(&dev->mtx);
exit: exit:
return retval; return retval;
@ -678,7 +678,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
dev_err(&intf->dev, "Out of memory\n"); dev_err(&intf->dev, "Out of memory\n");
goto exit; goto exit;
} }
init_MUTEX(&dev->sem); mutex_init(&dev->mtx);
dev->intf = intf; dev->intf = intf;
init_waitqueue_head(&dev->read_wait); init_waitqueue_head(&dev->read_wait);
init_waitqueue_head(&dev->write_wait); init_waitqueue_head(&dev->write_wait);
@ -835,7 +835,7 @@ static void usb_alphatrack_disconnect(struct usb_interface *intf)
dev = usb_get_intfdata(intf); dev = usb_get_intfdata(intf);
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
down(&dev->sem); mutex_lock(&dev->mtx);
minor = intf->minor; minor = intf->minor;
@ -844,11 +844,11 @@ static void usb_alphatrack_disconnect(struct usb_interface *intf)
/* if the device is not opened, then we clean up right now */ /* if the device is not opened, then we clean up right now */
if (!dev->open_count) { if (!dev->open_count) {
up(&dev->sem); mutex_unlock(&dev->mtx);
usb_alphatrack_delete(dev); usb_alphatrack_delete(dev);
} else { } else {
dev->intf = NULL; dev->intf = NULL;
up(&dev->sem); mutex_unlock(&dev->mtx);
} }
atomic_set(&dev->writes_pending, 0); atomic_set(&dev->writes_pending, 0);

28
drivers/staging/frontier/tranzport.c
View File

@ -123,7 +123,7 @@ struct tranzport_cmd {
/* Structure to hold all of our device specific stuff */ /* Structure to hold all of our device specific stuff */
struct usb_tranzport { struct usb_tranzport {
struct semaphore sem; /* locks this structure */ struct mutex mtx; /* locks this structure */
struct usb_interface *intf; /* save off the usb interface pointer */ struct usb_interface *intf; /* save off the usb interface pointer */
int open_count; /* number of times this port opened */ int open_count; /* number of times this port opened */
struct tranzport_cmd (*ring_buffer)[RING_BUFFER_SIZE]; struct tranzport_cmd (*ring_buffer)[RING_BUFFER_SIZE];
@ -367,7 +367,7 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
} }
/* lock this device */ /* lock this device */
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto unlock_disconnect_exit; goto unlock_disconnect_exit;
} }
@ -411,7 +411,7 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
file->private_data = dev; file->private_data = dev;
unlock_exit: unlock_exit:
up(&dev->sem); mutex_unlock(&dev->mtx);
unlock_disconnect_exit: unlock_disconnect_exit:
mutex_unlock(&disconnect_mutex); mutex_unlock(&disconnect_mutex);
@ -434,7 +434,7 @@ static int usb_tranzport_release(struct inode *inode, struct file *file)
goto exit; goto exit;
} }
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
@ -446,7 +446,7 @@ static int usb_tranzport_release(struct inode *inode, struct file *file)
if (dev->intf == NULL) { if (dev->intf == NULL) {
/* the device was unplugged before the file was released */ /* the device was unplugged before the file was released */
up(&dev->sem); mutex_unlock(&dev->mtx);
/* unlock here as usb_tranzport_delete frees dev */ /* unlock here as usb_tranzport_delete frees dev */
usb_tranzport_delete(dev); usb_tranzport_delete(dev);
retval = -ENODEV; retval = -ENODEV;
@ -462,7 +462,7 @@ static int usb_tranzport_release(struct inode *inode, struct file *file)
dev->open_count = 0; dev->open_count = 0;
unlock_exit: unlock_exit:
up(&dev->sem); mutex_unlock(&dev->mtx);
exit: exit:
return retval; return retval;
@ -512,7 +512,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer,
goto exit; goto exit;
/* lock this object */ /* lock this object */
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
@ -660,7 +660,7 @@ retval = 8;
unlock_exit: unlock_exit:
/* unlock the device */ /* unlock the device */
up(&dev->sem); mutex_unlock(&dev->mtx);
exit: exit:
return retval; return retval;
@ -684,7 +684,7 @@ static ssize_t usb_tranzport_write(struct file *file,
goto exit; goto exit;
/* lock this object */ /* lock this object */
if (down_interruptible(&dev->sem)) { if (mutex_lock_interruptible(&dev->mtx)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
@ -753,7 +753,7 @@ static ssize_t usb_tranzport_write(struct file *file,
unlock_exit: unlock_exit:
/* unlock the device */ /* unlock the device */
up(&dev->sem); mutex_unlock(&dev->mtx);
exit: exit:
return retval; return retval;
@ -802,7 +802,7 @@ static int usb_tranzport_probe(struct usb_interface *intf,
dev_err(&intf->dev, "Out of memory\n"); dev_err(&intf->dev, "Out of memory\n");
goto exit; goto exit;
} }
init_MUTEX(&dev->sem); mutex_init(&dev->mtx);
dev->intf = intf; dev->intf = intf;
init_waitqueue_head(&dev->read_wait); init_waitqueue_head(&dev->read_wait);
init_waitqueue_head(&dev->write_wait); init_waitqueue_head(&dev->write_wait);
@ -942,18 +942,18 @@ static void usb_tranzport_disconnect(struct usb_interface *intf)
mutex_lock(&disconnect_mutex); mutex_lock(&disconnect_mutex);
dev = usb_get_intfdata(intf); dev = usb_get_intfdata(intf);
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
down(&dev->sem); mutex_lock(&dev->mtx);
minor = intf->minor; minor = intf->minor;
/* give back our minor */ /* give back our minor */
usb_deregister_dev(intf, &usb_tranzport_class); usb_deregister_dev(intf, &usb_tranzport_class);
/* if the device is not opened, then we clean up right now */ /* if the device is not opened, then we clean up right now */
if (!dev->open_count) { if (!dev->open_count) {
up(&dev->sem); mutex_unlock(&dev->mtx);
usb_tranzport_delete(dev); usb_tranzport_delete(dev);
} else { } else {
dev->intf = NULL; dev->intf = NULL;
up(&dev->sem); mutex_unlock(&dev->mtx);
} }
mutex_unlock(&disconnect_mutex); mutex_unlock(&disconnect_mutex);