Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: testing driver: convert dev->sem to mutex

Browse Source 
USB testing driver: convert semaphore dev->sem to the mutex API

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Matthias Kaehlcke 2007-12-13 16:15:33 -08:00 committed by Greg Kroah-Hartman
parent 041509db39
commit 1cfab028af
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/usb/misc/usbtest.c
View File

@ -6,6 +6,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/mutex.h>
#include <linux/usb.h> #include <linux/usb.h>
@ -64,7 +65,7 @@ struct usbtest_dev {
int in_iso_pipe; int in_iso_pipe;
int out_iso_pipe; int out_iso_pipe;
struct usb_endpoint_descriptor *iso_in, *iso_out; struct usb_endpoint_descriptor *iso_in, *iso_out;
struct semaphore sem; struct mutex lock;
#define TBUF_SIZE 256 #define TBUF_SIZE 256
u8 *buf; u8 *buf;
@ -1559,11 +1560,11 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
|| param->sglen < 0 || param->vary < 0) || param->sglen < 0 || param->vary < 0)
return -EINVAL; return -EINVAL;
if (down_interruptible (&dev->sem)) if (mutex_lock_interruptible(&dev->lock))
return -ERESTARTSYS; return -ERESTARTSYS;
if (intf->dev.power.power_state.event != PM_EVENT_ON) { if (intf->dev.power.power_state.event != PM_EVENT_ON) {
up (&dev->sem); mutex_unlock(&dev->lock);
return -EHOSTUNREACH; return -EHOSTUNREACH;
} }
@ -1575,7 +1576,7 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
int res; int res;
if (intf->altsetting->desc.bInterfaceNumber) { if (intf->altsetting->desc.bInterfaceNumber) {
up (&dev->sem); mutex_unlock(&dev->lock);
return -ENODEV; return -ENODEV;
} }
res = set_altsetting (dev, dev->info->alt); res = set_altsetting (dev, dev->info->alt);
@ -1583,7 +1584,7 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
dev_err (&intf->dev, dev_err (&intf->dev,
"set altsetting to %d failed, %d\n", "set altsetting to %d failed, %d\n",
dev->info->alt, res); dev->info->alt, res);
up (&dev->sem); mutex_unlock(&dev->lock);
return res; return res;
} }
} }
@ -1856,7 +1857,7 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
param->duration.tv_usec += 1000 * 1000; param->duration.tv_usec += 1000 * 1000;
param->duration.tv_sec -= 1; param->duration.tv_sec -= 1;
} }
up (&dev->sem); mutex_unlock(&dev->lock);
return retval; return retval;
} }
@ -1906,7 +1907,7 @@ usbtest_probe (struct usb_interface *intf, const struct usb_device_id *id)
return -ENOMEM; return -ENOMEM;
info = (struct usbtest_info *) id->driver_info; info = (struct usbtest_info *) id->driver_info;
dev->info = info; dev->info = info;
init_MUTEX (&dev->sem); mutex_init(&dev->lock);
dev->intf = intf; dev->intf = intf;
@ -1991,7 +1992,7 @@ static void usbtest_disconnect (struct usb_interface *intf)
{ {
struct usbtest_dev *dev = usb_get_intfdata (intf); struct usbtest_dev *dev = usb_get_intfdata (intf);
down (&dev->sem); mutex_lock(&dev->lock);
usb_set_intfdata (intf, NULL); usb_set_intfdata (intf, NULL);
dev_dbg (&intf->dev, "disconnect\n"); dev_dbg (&intf->dev, "disconnect\n");