The patch titled
USB testing driver: convert dev->sem to mutex
has been removed from the -mm tree. Its filename was
usb-testing-driver-convert-dev-sem-to-mutex.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: USB testing driver: convert dev->sem to mutex
From: Matthias Kaehlcke <[EMAIL PROTECTED]>
USB testing driver: convert semaphore dev->sem to the mutex API
Signed-off-by: Matthias Kaehlcke <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/usb/misc/usbtest.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff -puN
drivers/usb/misc/usbtest.c~usb-testing-driver-convert-dev-sem-to-mutex
drivers/usb/misc/usbtest.c
--- a/drivers/usb/misc/usbtest.c~usb-testing-driver-convert-dev-sem-to-mutex
+++ a/drivers/usb/misc/usbtest.c
@@ -6,6 +6,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/scatterlist.h>
+#include <linux/mutex.h>
#include <linux/usb.h>
@@ -64,7 +65,7 @@ struct usbtest_dev {
int in_iso_pipe;
int out_iso_pipe;
struct usb_endpoint_descriptor *iso_in, *iso_out;
- struct semaphore sem;
+ struct mutex lock;
#define TBUF_SIZE 256
u8 *buf;
@@ -1558,11 +1559,11 @@ usbtest_ioctl (struct usb_interface *int
|| param->sglen < 0 || param->vary < 0)
return -EINVAL;
- if (down_interruptible (&dev->sem))
+ if (mutex_lock_interruptible(&dev->lock))
return -ERESTARTSYS;
if (intf->dev.power.power_state.event != PM_EVENT_ON) {
- up (&dev->sem);
+ mutex_unlock(&dev->lock);
return -EHOSTUNREACH;
}
@@ -1574,7 +1575,7 @@ usbtest_ioctl (struct usb_interface *int
int res;
if (intf->altsetting->desc.bInterfaceNumber) {
- up (&dev->sem);
+ mutex_unlock(&dev->lock);
return -ENODEV;
}
res = set_altsetting (dev, dev->info->alt);
@@ -1582,7 +1583,7 @@ usbtest_ioctl (struct usb_interface *int
dev_err (&intf->dev,
"set altsetting to %d failed, %d\n",
dev->info->alt, res);
- up (&dev->sem);
+ mutex_unlock(&dev->lock);
return res;
}
}
@@ -1855,7 +1856,7 @@ usbtest_ioctl (struct usb_interface *int
param->duration.tv_usec += 1000 * 1000;
param->duration.tv_sec -= 1;
}
- up (&dev->sem);
+ mutex_unlock(&dev->lock);
return retval;
}
@@ -1905,7 +1906,7 @@ usbtest_probe (struct usb_interface *int
return -ENOMEM;
info = (struct usbtest_info *) id->driver_info;
dev->info = info;
- init_MUTEX (&dev->sem);
+ mutex_init(&dev->lock);
dev->intf = intf;
@@ -1990,7 +1991,7 @@ static void usbtest_disconnect (struct u
{
struct usbtest_dev *dev = usb_get_intfdata (intf);
- down (&dev->sem);
+ mutex_lock(&dev->lock);
usb_set_intfdata (intf, NULL);
dev_dbg (&intf->dev, "disconnect\n");
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
acpi_pci_irq_find_prt_entry-use-list_for_each_entry-instead-of-list_for_each.patch
git-dvb.patch
git-infiniband.patch
git-net.patch
git-netdev-all.patch
git-scsi-misc.patch
parallel-port-convert-port_mutex-to-the-mutex-api.patch
parallel-port-convert-port_mutex-to-the-mutex-api-checkpatch-fixes.patch
mbcs-convert-algolock-to-mutex.patch
mbcs-convert-dmawritelock-to-mutex.patch
mbcs-convert-dmareadlock-to-mutex.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
