Commit 4b1a7cf1 authored by Christian Gromm's avatar Christian Gromm Committed by Greg Kroah-Hartman

staging: most: hdm-usb: remove completion object

Waiting for the urb_compl object to complete evaluates always as false.
This patch removes this unnecessary completion object.
Signed-off-by: default avatarAndrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: default avatarChristian Gromm <christian.gromm@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b24c9fe9
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
struct buf_anchor { struct buf_anchor {
struct urb *urb; struct urb *urb;
struct list_head list; struct list_head list;
struct completion urb_compl;
}; };
/** /**
...@@ -217,12 +216,7 @@ static void free_anchored_buffers(struct most_dev *mdev, unsigned int channel, ...@@ -217,12 +216,7 @@ static void free_anchored_buffers(struct most_dev *mdev, unsigned int channel,
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
if (likely(urb)) { if (likely(urb)) {
mbo = urb->context; mbo = urb->context;
if (!irqs_disabled()) { usb_kill_urb(urb);
usb_kill_urb(urb);
} else {
usb_unlink_urb(urb);
wait_for_completion(&anchor->urb_compl);
}
if ((mbo) && (mbo->complete)) { if ((mbo) && (mbo->complete)) {
mbo->status = status; mbo->status = status;
mbo->processed_length = 0; mbo->processed_length = 0;
...@@ -416,7 +410,6 @@ static void hdm_write_completion(struct urb *urb) ...@@ -416,7 +410,6 @@ static void hdm_write_completion(struct urb *urb)
if ((urb->status == -ENOENT) || (urb->status == -ECONNRESET) || if ((urb->status == -ENOENT) || (urb->status == -ECONNRESET) ||
(!mdev->is_channel_healthy[channel])) { (!mdev->is_channel_healthy[channel])) {
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
complete(&anchor->urb_compl);
return; return;
} }
...@@ -582,7 +575,6 @@ static void hdm_read_completion(struct urb *urb) ...@@ -582,7 +575,6 @@ static void hdm_read_completion(struct urb *urb)
if ((urb->status == -ENOENT) || (urb->status == -ECONNRESET) || if ((urb->status == -ENOENT) || (urb->status == -ECONNRESET) ||
(!mdev->is_channel_healthy[channel])) { (!mdev->is_channel_healthy[channel])) {
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
complete(&anchor->urb_compl);
return; return;
} }
...@@ -678,7 +670,6 @@ static int hdm_enqueue(struct most_interface *iface, int channel, ...@@ -678,7 +670,6 @@ static int hdm_enqueue(struct most_interface *iface, int channel,
} }
anchor->urb = urb; anchor->urb = urb;
init_completion(&anchor->urb_compl);
mbo->priv = anchor; mbo->priv = anchor;
if ((mdev->padding_active[channel]) && if ((mdev->padding_active[channel]) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment