Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: reorganize urb->status use in dummy-hcd

Browse source 
This patch (as973) reorganizes the way dummy-hcd sets urb->status.  It
now keeps the information in a local variable until the last moment.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2007-08-24 15:40:10 -04:00 • committed by Greg Kroah-Hartman
parent e7beb66784
commit 4d2f110c51
1 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
drivers/usb/gadget/dummy_hcd.c
View file

@ -1026,16 +1026,10 @@ static int dummy_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
return rc; return rc;
} }
static void maybe_set_status (struct urb *urb, int status)
{
spin_lock (&urb->lock);
urb->status = status;
spin_unlock (&urb->lock);
}
/* transfer up to a frame's worth; caller must own lock */ /* transfer up to a frame's worth; caller must own lock */
static int static int
transfer (struct dummy *dum, struct urb *urb, struct dummy_ep *ep, int limit) transfer(struct dummy *dum, struct urb *urb, struct dummy_ep *ep, int limit,
int *status)
{ {
struct dummy_request *req; struct dummy_request *req;
@ -1103,15 +1097,15 @@ transfer (struct dummy *dum, struct urb *urb, struct dummy_ep *ep, int limit)
if (is_short) { if (is_short) {
if (host_len == dev_len) { if (host_len == dev_len) {
req->req.status = 0; req->req.status = 0;
maybe_set_status (urb, 0); *status = 0;
} else if (to_host) { } else if (to_host) {
req->req.status = 0; req->req.status = 0;
if (dev_len > host_len) if (dev_len > host_len)
maybe_set_status (urb, -EOVERFLOW); *status = -EOVERFLOW;
else else
maybe_set_status (urb, 0); *status = 0;
} else if (!to_host) { } else if (!to_host) {
maybe_set_status (urb, 0); *status = 0;
if (host_len > dev_len) if (host_len > dev_len)
req->req.status = -EOVERFLOW; req->req.status = -EOVERFLOW;
else else
@ -1125,9 +1119,8 @@ transfer (struct dummy *dum, struct urb *urb, struct dummy_ep *ep, int limit)
req->req.status = 0; req->req.status = 0;
if (urb->transfer_buffer_length == urb->actual_length if (urb->transfer_buffer_length == urb->actual_length
&& !(urb->transfer_flags && !(urb->transfer_flags
& URB_ZERO_PACKET)) { & URB_ZERO_PACKET))
maybe_set_status (urb, 0); *status = 0;
}
} }
/* device side completion --> continuable */ /* device side completion --> continuable */
@ -1143,7 +1136,7 @@ transfer (struct dummy *dum, struct urb *urb, struct dummy_ep *ep, int limit)
} }
/* host side completion --> terminate */ /* host side completion --> terminate */
if (urb->status != -EINPROGRESS) if (*status != -EINPROGRESS)
break; break;
/* rescan to continue with any other queued i/o */ /* rescan to continue with any other queued i/o */
@ -1254,6 +1247,7 @@ static void dummy_timer (unsigned long _dum)
u8 address; u8 address;
struct dummy_ep *ep = NULL; struct dummy_ep *ep = NULL;
int type; int type;
int status = -EINPROGRESS;
urb = urbp->urb; urb = urbp->urb;
if (urb->unlinked) if (urb->unlinked)
@ -1279,7 +1273,7 @@ static void dummy_timer (unsigned long _dum)
dev_dbg (dummy_dev(dum), dev_dbg (dummy_dev(dum),
"no ep configured for urb %p\n", "no ep configured for urb %p\n",
urb); urb);
maybe_set_status (urb, -EPROTO); status = -EPROTO;
goto return_urb; goto return_urb;
} }
@ -1294,7 +1288,7 @@ static void dummy_timer (unsigned long _dum)
/* NOTE: must not be iso! */ /* NOTE: must not be iso! */
dev_dbg (dummy_dev(dum), "ep %s halted, urb %p\n", dev_dbg (dummy_dev(dum), "ep %s halted, urb %p\n",
ep->ep.name, urb); ep->ep.name, urb);
maybe_set_status (urb, -EPIPE); status = -EPIPE;
goto return_urb; goto return_urb;
} }
/* FIXME make sure both ends agree on maxpacket */ /* FIXME make sure both ends agree on maxpacket */
@ -1312,7 +1306,7 @@ static void dummy_timer (unsigned long _dum)
w_value = le16_to_cpu(setup.wValue); w_value = le16_to_cpu(setup.wValue);
if (le16_to_cpu(setup.wLength) != if (le16_to_cpu(setup.wLength) !=
urb->transfer_buffer_length) { urb->transfer_buffer_length) {
maybe_set_status (urb, -EOVERFLOW); status = -EOVERFLOW;
goto return_urb; goto return_urb;
} }
@ -1342,7 +1336,7 @@ static void dummy_timer (unsigned long _dum)
if (setup.bRequestType != Dev_Request) if (setup.bRequestType != Dev_Request)
break; break;
dum->address = w_value; dum->address = w_value;
maybe_set_status (urb, 0); status = 0;
dev_dbg (udc_dev(dum), "set_address = %d\n", dev_dbg (udc_dev(dum), "set_address = %d\n",
w_value); w_value);
value = 0; value = 0;
@ -1369,7 +1363,7 @@ static void dummy_timer (unsigned long _dum)
if (value == 0) { if (value == 0) {
dum->devstatus |= dum->devstatus |=
(1 << w_value); (1 << w_value);
maybe_set_status (urb, 0); status = 0;
} }
} else if (setup.bRequestType == Ep_Request) { } else if (setup.bRequestType == Ep_Request) {
@ -1381,7 +1375,7 @@ static void dummy_timer (unsigned long _dum)
} }
ep2->halted = 1; ep2->halted = 1;
value = 0; value = 0;
maybe_set_status (urb, 0); status = 0;
} }
break; break;
case USB_REQ_CLEAR_FEATURE: case USB_REQ_CLEAR_FEATURE:
@ -1391,7 +1385,7 @@ static void dummy_timer (unsigned long _dum)
dum->devstatus &= ~(1 << dum->devstatus &= ~(1 <<
USB_DEVICE_REMOTE_WAKEUP); USB_DEVICE_REMOTE_WAKEUP);
value = 0; value = 0;
maybe_set_status (urb, 0); status = 0;
break; break;
default: default:
value = -EOPNOTSUPP; value = -EOPNOTSUPP;
@ -1406,7 +1400,7 @@ static void dummy_timer (unsigned long _dum)
} }
ep2->halted = 0; ep2->halted = 0;
value = 0; value = 0;
maybe_set_status (urb, 0); status = 0;
} }
break; break;
case USB_REQ_GET_STATUS: case USB_REQ_GET_STATUS:
@ -1443,7 +1437,7 @@ static void dummy_timer (unsigned long _dum)
urb->actual_length = min (2, urb->actual_length = min (2,
urb->transfer_buffer_length); urb->transfer_buffer_length);
value = 0; value = 0;
maybe_set_status (urb, 0); status = 0;
} }
break; break;
} }
@ -1470,7 +1464,7 @@ static void dummy_timer (unsigned long _dum)
dev_dbg (udc_dev(dum), dev_dbg (udc_dev(dum),
"setup --> %d\n", "setup --> %d\n",
value); value);
maybe_set_status (urb, -EPIPE); status = -EPIPE;
urb->actual_length = 0; urb->actual_length = 0;
} }
@ -1487,7 +1481,7 @@ static void dummy_timer (unsigned long _dum)
* report random errors, to debug drivers. * report random errors, to debug drivers.
*/ */
limit = max (limit, periodic_bytes (dum, ep)); limit = max (limit, periodic_bytes (dum, ep));
maybe_set_status (urb, -ENOSYS); status = -ENOSYS;
break; break;
case PIPE_INTERRUPT: case PIPE_INTERRUPT:
@ -1501,12 +1495,12 @@ static void dummy_timer (unsigned long _dum)
default: default:
treat_control_like_bulk: treat_control_like_bulk:
ep->last_io = jiffies; ep->last_io = jiffies;
total = transfer (dum, urb, ep, limit); total = transfer(dum, urb, ep, limit, &status);
break; break;
} }
/* incomplete transfer? */ /* incomplete transfer? */
if (urb->status == -EINPROGRESS) if (status == -EINPROGRESS)
continue; continue;
return_urb: return_urb:
@ -1517,6 +1511,7 @@ static void dummy_timer (unsigned long _dum)
usb_hcd_unlink_urb_from_ep(dummy_to_hcd(dum), urb); usb_hcd_unlink_urb_from_ep(dummy_to_hcd(dum), urb);
spin_unlock (&dum->lock); spin_unlock (&dum->lock);
urb->status = status;
usb_hcd_giveback_urb (dummy_to_hcd(dum), urb); usb_hcd_giveback_urb (dummy_to_hcd(dum), urb);
spin_lock (&dum->lock); spin_lock (&dum->lock);