56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 53a9508f5983092928b0e6e12f400b686e1f04b1 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Mon, 28 Oct 2013 11:50:06 +0100
|
|
Subject: [PATCH] a few open coded completions
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.12/patches-3.12.5-rt7.tar.xz
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
|
|
drivers/usb/gadget/f_fs.c | 2 +-
|
|
drivers/usb/gadget/inode.c | 4 ++--
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
|
|
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
|
|
@@ -714,7 +714,7 @@ static void ezusb_req_ctx_wait(struct ez
|
|
while (!ctx->done.done && msecs--)
|
|
udelay(1000);
|
|
} else {
|
|
- wait_event_interruptible(ctx->done.wait,
|
|
+ swait_event_interruptible(ctx->done.wait,
|
|
ctx->done.done);
|
|
}
|
|
break;
|
|
--- a/drivers/usb/gadget/f_fs.c
|
|
+++ b/drivers/usb/gadget/f_fs.c
|
|
@@ -1282,7 +1282,7 @@ static void ffs_data_put(struct ffs_data
|
|
pr_info("%s(): freeing\n", __func__);
|
|
ffs_data_clear(ffs);
|
|
BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
|
|
- waitqueue_active(&ffs->ep0req_completion.wait));
|
|
+ swaitqueue_active(&ffs->ep0req_completion.wait));
|
|
kfree(ffs->dev_name);
|
|
kfree(ffs);
|
|
}
|
|
--- a/drivers/usb/gadget/inode.c
|
|
+++ b/drivers/usb/gadget/inode.c
|
|
@@ -340,7 +340,7 @@ ep_io (struct ep_data *epdata, void *buf
|
|
spin_unlock_irq (&epdata->dev->lock);
|
|
|
|
if (likely (value == 0)) {
|
|
- value = wait_event_interruptible (done.wait, done.done);
|
|
+ value = swait_event_interruptible (done.wait, done.done);
|
|
if (value != 0) {
|
|
spin_lock_irq (&epdata->dev->lock);
|
|
if (likely (epdata->ep != NULL)) {
|
|
@@ -349,7 +349,7 @@ ep_io (struct ep_data *epdata, void *buf
|
|
usb_ep_dequeue (epdata->ep, epdata->req);
|
|
spin_unlock_irq (&epdata->dev->lock);
|
|
|
|
- wait_event (done.wait, done.done);
|
|
+ swait_event (done.wait, done.done);
|
|
if (epdata->status == -ECONNRESET)
|
|
epdata->status = -EINTR;
|
|
} else {
|