git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
core
/
urb.c
diff --git
a/drivers/usb/core/urb.c
b/drivers/usb/core/urb.c
index
dad4d8f
..
9801d08
100644
(file)
--- a/
drivers/usb/core/urb.c
+++ b/
drivers/usb/core/urb.c
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/bitops.h>
@@
-58,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) {
@@
-222,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)
@@
-234,8
+232,6
@@
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;
@@
-377,7
+373,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);
}
/*-------------------------------------------------------------------*/
}
/*-------------------------------------------------------------------*/
@@
-441,9
+437,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);
}
/**
}
/**
@@
-469,13
+465,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);