projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow arch to initialize arch field of the module structure
[powerpc.git]
/
drivers
/
usb
/
core
/
urb.c
diff --git
a/drivers/usb/core/urb.c
b/drivers/usb/core/urb.c
index
9864988
..
94ea972
100644
(file)
--- a/
drivers/usb/core/urb.c
+++ b/
drivers/usb/core/urb.c
@@
-57,7
+57,7
@@
struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags)
{
struct urb *urb;
{
struct urb *urb;
- urb =
(struct urb *)kmalloc(sizeof(struct urb) +
+ urb =
kmalloc(sizeof(struct urb) +
iso_packets * sizeof(struct usb_iso_packet_descriptor),
mem_flags);
if (!urb) {
iso_packets * sizeof(struct usb_iso_packet_descriptor),
mem_flags);
if (!urb) {
@@
-221,7
+221,6
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
{
int pipe, temp, max;
struct usb_device *dev;
{
int pipe, temp, max;
struct usb_device *dev;
- struct usb_operations *op;
int is_out;
if (!urb || urb->hcpriv || !urb->complete)
int is_out;
if (!urb || urb->hcpriv || !urb->complete)
@@
-233,21
+232,18
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
if (dev->bus->controller->power.power_state.event != PM_EVENT_ON
|| dev->state == USB_STATE_SUSPENDED)
return -EHOSTUNREACH;
if (dev->bus->controller->power.power_state.event != PM_EVENT_ON
|| dev->state == USB_STATE_SUSPENDED)
return -EHOSTUNREACH;
- if (!(op = dev->bus->op) || !op->submit_urb)
- return -ENODEV;
urb->status = -EINPROGRESS;
urb->actual_length = 0;
urb->status = -EINPROGRESS;
urb->actual_length = 0;
- urb->bandwidth = 0;
/* Lots of sanity checks, so HCDs can rely on clean data
* and don't need to duplicate tests
*/
pipe = urb->pipe;
/* Lots of sanity checks, so HCDs can rely on clean data
* and don't need to duplicate tests
*/
pipe = urb->pipe;
- temp = usb_pipetype
(pipe);
- is_out = usb_pipeout
(pipe);
+ temp = usb_pipetype(pipe);
+ is_out = usb_pipeout(pipe);
- if (!usb_pipecontrol
(pipe) && dev->state < USB_STATE_CONFIGURED)
+ if (!usb_pipecontrol(pipe) && dev->state < USB_STATE_CONFIGURED)
return -ENODEV;
/* FIXME there should be a sharable lock protecting us against
return -ENODEV;
/* FIXME there should be a sharable lock protecting us against
@@
-256,11
+252,11
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
* checks get made.)
*/
* checks get made.)
*/
- max = usb_maxpacket
(dev, pipe, is_out);
+ max = usb_maxpacket(dev, pipe, is_out);
if (max <= 0) {
dev_dbg(&dev->dev,
"bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
if (max <= 0) {
dev_dbg(&dev->dev,
"bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
- usb_pipeendpoint
(pipe), is_out ? "out" : "in",
+ usb_pipeendpoint(pipe), is_out ? "out" : "in",
__FUNCTION__, max);
return -EMSGSIZE;
}
__FUNCTION__, max);
return -EMSGSIZE;
}
@@
-282,11
+278,11
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
if (urb->number_of_packets <= 0)
return -EINVAL;
for (n = 0; n < urb->number_of_packets; n++) {
if (urb->number_of_packets <= 0)
return -EINVAL;
for (n = 0; n < urb->number_of_packets; n++) {
- len = urb->iso_frame_desc
[n].length;
+ len = urb->iso_frame_desc[n].length;
if (len < 0 || len > max)
return -EMSGSIZE;
if (len < 0 || len > max)
return -EMSGSIZE;
- urb->iso_frame_desc
[n].status = -EXDEV;
- urb->iso_frame_desc
[n].actual_length = 0;
+ urb->iso_frame_desc[n].status = -EXDEV;
+ urb->iso_frame_desc[n].actual_length = 0;
}
}
}
}
@@
-325,7
+321,7
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
/* fail if submitter gave bogus flags */
if (urb->transfer_flags != orig_flags) {
/* fail if submitter gave bogus flags */
if (urb->transfer_flags != orig_flags) {
- err
("BOGUS urb flags, %x --> %x",
+ err("BOGUS urb flags, %x --> %x",
orig_flags, urb->transfer_flags);
return -EINVAL;
}
orig_flags, urb->transfer_flags);
return -EINVAL;
}
@@
-376,7
+372,7
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
urb->interval = temp;
}
urb->interval = temp;
}
- return
op->submit_urb
(urb, mem_flags);
+ return
usb_hcd_submit_urb
(urb, mem_flags);
}
/*-------------------------------------------------------------------*/
}
/*-------------------------------------------------------------------*/
@@
-440,9
+436,9
@@
int usb_unlink_urb(struct urb *urb)
{
if (!urb)
return -EINVAL;
{
if (!urb)
return -EINVAL;
- if (!(urb->dev && urb->dev->bus
&& urb->dev->bus->op
))
+ if (!(urb->dev && urb->dev->bus))
return -ENODEV;
return -ENODEV;
- return u
rb->dev->bus->op->
unlink_urb(urb, -ECONNRESET);
+ return u
sb_hcd_
unlink_urb(urb, -ECONNRESET);
}
/**
}
/**
@@
-468,13
+464,13
@@
int usb_unlink_urb(struct urb *urb)
void usb_kill_urb(struct urb *urb)
{
might_sleep();
void usb_kill_urb(struct urb *urb)
{
might_sleep();
- if (!(urb && urb->dev && urb->dev->bus
&& urb->dev->bus->op
))
+ if (!(urb && urb->dev && urb->dev->bus))
return;
spin_lock_irq(&urb->lock);
++urb->reject;
spin_unlock_irq(&urb->lock);
return;
spin_lock_irq(&urb->lock);
++urb->reject;
spin_unlock_irq(&urb->lock);
- u
rb->dev->bus->op->
unlink_urb(urb, -ENOENT);
+ u
sb_hcd_
unlink_urb(urb, -ENOENT);
wait_event(usb_kill_urb_queue, atomic_read(&urb->use_count) == 0);
spin_lock_irq(&urb->lock);
wait_event(usb_kill_urb_queue, atomic_read(&urb->use_count) == 0);
spin_lock_irq(&urb->lock);