diff options
Diffstat (limited to 'drivers/usb')
27 files changed, 1 insertions, 28 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index b3f779f5933a..b082d95bbbaa 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
@@ -77,7 +77,6 @@ | |||
77 | #include <linux/sched.h> | 77 | #include <linux/sched.h> |
78 | #include <linux/signal.h> | 78 | #include <linux/signal.h> |
79 | #include <linux/slab.h> | 79 | #include <linux/slab.h> |
80 | #include <linux/smp_lock.h> | ||
81 | #include <linux/stat.h> | 80 | #include <linux/stat.h> |
82 | #include <linux/timer.h> | 81 | #include <linux/timer.h> |
83 | #include <linux/wait.h> | 82 | #include <linux/wait.h> |
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 14de3b1b6a20..0081c1d12687 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <linux/tty_driver.h> | 59 | #include <linux/tty_driver.h> |
60 | #include <linux/tty_flip.h> | 60 | #include <linux/tty_flip.h> |
61 | #include <linux/module.h> | 61 | #include <linux/module.h> |
62 | #include <linux/smp_lock.h> | ||
63 | #include <linux/mutex.h> | 62 | #include <linux/mutex.h> |
64 | #include <asm/uaccess.h> | 63 | #include <asm/uaccess.h> |
65 | #include <linux/usb.h> | 64 | #include <linux/usb.h> |
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 6584cf00f7f3..15e740e3a5c4 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
50 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
51 | #include <linux/sched.h> | 51 | #include <linux/sched.h> |
52 | #include <linux/smp_lock.h> | ||
53 | #include <linux/signal.h> | 52 | #include <linux/signal.h> |
54 | #include <linux/poll.h> | 53 | #include <linux/poll.h> |
55 | #include <linux/init.h> | 54 | #include <linux/init.h> |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index bde29ab2b504..f6b74a678de5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/list.h> | 17 | #include <linux/list.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/smp_lock.h> | ||
20 | #include <linux/ioctl.h> | 19 | #include <linux/ioctl.h> |
21 | #include <linux/usb.h> | 20 | #include <linux/usb.h> |
22 | #include <linux/usbdevice_fs.h> | 21 | #include <linux/usbdevice_fs.h> |
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index cddfc62c4611..cd4f11157280 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/usb.h> | 36 | #include <linux/usb.h> |
37 | #include <linux/namei.h> | 37 | #include <linux/namei.h> |
38 | #include <linux/usbdevice_fs.h> | 38 | #include <linux/usbdevice_fs.h> |
39 | #include <linux/smp_lock.h> | ||
40 | #include <linux/parser.h> | 39 | #include <linux/parser.h> |
41 | #include <linux/notifier.h> | 40 | #include <linux/notifier.h> |
42 | #include <asm/byteorder.h> | 41 | #include <asm/byteorder.h> |
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index dfd1b5c87ca3..18ddc5e67e39 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
33 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
34 | #include <linux/smp_lock.h> | ||
35 | #include <linux/usb.h> | 34 | #include <linux/usb.h> |
36 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
37 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 2a6e3163d944..ba163f35bf21 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/smp_lock.h> | ||
35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
37 | #include <linux/list.h> | 36 | #include <linux/list.h> |
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 7d7909cf2558..fcb5526cb085 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
42 | #include <linux/ioport.h> | 42 | #include <linux/ioport.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/smp_lock.h> | ||
45 | #include <linux/errno.h> | 44 | #include <linux/errno.h> |
46 | #include <linux/init.h> | 45 | #include <linux/init.h> |
47 | #include <linux/timer.h> | 46 | #include <linux/timer.h> |
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 1dd8b57f4420..325bf7cfb83f 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/smp_lock.h> | ||
32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
34 | #include <linux/timer.h> | 33 | #include <linux/timer.h> |
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index 65c91d3735de..ae931af05cef 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/smp_lock.h> | ||
34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
36 | #include <linux/timer.h> | 35 | #include <linux/timer.h> |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 49d737725f70..52779c52b56d 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -54,7 +54,6 @@ | |||
54 | #include <linux/delay.h> | 54 | #include <linux/delay.h> |
55 | #include <linux/ioport.h> | 55 | #include <linux/ioport.h> |
56 | #include <linux/slab.h> | 56 | #include <linux/slab.h> |
57 | #include <linux/smp_lock.h> | ||
58 | #include <linux/errno.h> | 57 | #include <linux/errno.h> |
59 | #include <linux/init.h> | 58 | #include <linux/init.h> |
60 | #include <linux/timer.h> | 59 | #include <linux/timer.h> |
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index e552668d36b3..f847c3414be3 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | #include <linux/ioport.h> | 23 | #include <linux/ioport.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/smp_lock.h> | ||
26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
28 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 8c85e33f74a4..7078374d0b79 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
@@ -67,7 +67,6 @@ | |||
67 | #include <linux/delay.h> | 67 | #include <linux/delay.h> |
68 | #include <linux/ioport.h> | 68 | #include <linux/ioport.h> |
69 | #include <linux/slab.h> | 69 | #include <linux/slab.h> |
70 | #include <linux/smp_lock.h> | ||
71 | #include <linux/errno.h> | 70 | #include <linux/errno.h> |
72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
73 | #include <linux/timer.h> | 72 | #include <linux/timer.h> |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index c7458f7e56cc..099aff64f536 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/smp_lock.h> | ||
28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
30 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index e8bbe8bc2598..a66637e725f3 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/smp_lock.h> | ||
30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
32 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 5fa5647ea095..4cfa3ff2c993 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/ioport.h> | 38 | #include <linux/ioport.h> |
39 | #include <linux/sched.h> | 39 | #include <linux/sched.h> |
40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
41 | #include <linux/smp_lock.h> | ||
42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
44 | #include <linux/timer.h> | 43 | #include <linux/timer.h> |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index a7fa0d75567d..ff0dba01f1c7 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <linux/pci_ids.h> | 43 | #include <linux/pci_ids.h> |
44 | #include <linux/sched.h> | 44 | #include <linux/sched.h> |
45 | #include <linux/slab.h> | 45 | #include <linux/slab.h> |
46 | #include <linux/smp_lock.h> | ||
47 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
48 | #include <linux/init.h> | 47 | #include <linux/init.h> |
49 | #include <linux/timer.h> | 48 | #include <linux/timer.h> |
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c index d308afd06935..36502a06f73a 100644 --- a/drivers/usb/image/mdc800.c +++ b/drivers/usb/image/mdc800.c | |||
@@ -94,7 +94,6 @@ | |||
94 | #include <linux/init.h> | 94 | #include <linux/init.h> |
95 | #include <linux/slab.h> | 95 | #include <linux/slab.h> |
96 | #include <linux/module.h> | 96 | #include <linux/module.h> |
97 | #include <linux/smp_lock.h> | ||
98 | #include <linux/wait.h> | 97 | #include <linux/wait.h> |
99 | #include <linux/mutex.h> | 98 | #include <linux/mutex.h> |
100 | 99 | ||
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 896cb2b71020..51bd80d2b8cc 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
@@ -128,7 +128,6 @@ | |||
128 | #include <linux/init.h> | 128 | #include <linux/init.h> |
129 | #include <linux/slab.h> | 129 | #include <linux/slab.h> |
130 | #include <linux/spinlock.h> | 130 | #include <linux/spinlock.h> |
131 | #include <linux/smp_lock.h> | ||
132 | #include <linux/usb.h> | 131 | #include <linux/usb.h> |
133 | #include <linux/proc_fs.h> | 132 | #include <linux/proc_fs.h> |
134 | 133 | ||
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c index 735723912950..8c8cd95a6989 100644 --- a/drivers/usb/input/xpad.c +++ b/drivers/usb/input/xpad.c | |||
@@ -74,7 +74,6 @@ | |||
74 | #include <linux/stat.h> | 74 | #include <linux/stat.h> |
75 | #include <linux/module.h> | 75 | #include <linux/module.h> |
76 | #include <linux/moduleparam.h> | 76 | #include <linux/moduleparam.h> |
77 | #include <linux/smp_lock.h> | ||
78 | #include <linux/usb/input.h> | 77 | #include <linux/usb/input.h> |
79 | 78 | ||
80 | #define DRIVER_VERSION "v0.0.6" | 79 | #define DRIVER_VERSION "v0.0.6" |
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 15c70bd048c4..8d0e360636e6 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/smp_lock.h> | ||
26 | #include <linux/completion.h> | 25 | #include <linux/completion.h> |
27 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
28 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c index 5dce797bddb7..1713e19a7899 100644 --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c | |||
@@ -80,7 +80,6 @@ | |||
80 | #include <linux/init.h> | 80 | #include <linux/init.h> |
81 | #include <linux/slab.h> | 81 | #include <linux/slab.h> |
82 | #include <linux/module.h> | 82 | #include <linux/module.h> |
83 | #include <linux/smp_lock.h> | ||
84 | #include <linux/completion.h> | 83 | #include <linux/completion.h> |
85 | #include <linux/mutex.h> | 84 | #include <linux/mutex.h> |
86 | #include <asm/uaccess.h> | 85 | #include <asm/uaccess.h> |
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c index fdf68479a166..88f6abe73624 100644 --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
40 | #include <linux/spinlock.h> | 40 | #include <linux/spinlock.h> |
41 | #include <linux/usb.h> | 41 | #include <linux/usb.h> |
42 | #include <linux/smp_lock.h> | ||
43 | #include <linux/wait.h> | 42 | #include <linux/wait.h> |
44 | 43 | ||
45 | #include "rio500_usb.h" | 44 | #include "rio500_usb.h" |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index 1730d8642a47..5947afb0017e 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include <linux/selection.h> | 62 | #include <linux/selection.h> |
63 | #include <linux/spinlock.h> | 63 | #include <linux/spinlock.h> |
64 | #include <linux/kref.h> | 64 | #include <linux/kref.h> |
65 | #include <linux/smp_lock.h> | ||
66 | #include <linux/ioport.h> | 65 | #include <linux/ioport.h> |
67 | #include <linux/interrupt.h> | 66 | #include <linux/interrupt.h> |
68 | #include <linux/vmalloc.h> | 67 | #include <linux/vmalloc.h> |
@@ -322,7 +321,7 @@ sisusbcon_deinit(struct vc_data *c) | |||
322 | /* interface routine */ | 321 | /* interface routine */ |
323 | static u8 | 322 | static u8 |
324 | sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity, | 323 | sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity, |
325 | u8 blink, u8 underline, u8 reverse) | 324 | u8 blink, u8 underline, u8 reverse, u8 unused) |
326 | { | 325 | { |
327 | u8 attr = color; | 326 | u8 attr = color; |
328 | 327 | ||
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c index 8a1df2c9c73e..8977ec0d0f99 100644 --- a/drivers/usb/mon/mon_main.c +++ b/drivers/usb/mon/mon_main.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/usb.h> | 11 | #include <linux/usb.h> |
12 | #include <linux/smp_lock.h> | ||
13 | #include <linux/notifier.h> | 12 | #include <linux/notifier.h> |
14 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
15 | 14 | ||
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 7639022cdf84..87f378806db6 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <linux/list.h> | 30 | #include <linux/list.h> |
31 | #include <linux/smp_lock.h> | ||
32 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
33 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
34 | #include <linux/usb/serial.h> | 33 | #include <linux/usb/serial.h> |
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 21f3ddbc9080..6dac1ffdde86 100644 --- a/drivers/usb/storage/usb.h +++ b/drivers/usb/storage/usb.h | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/usb.h> | 47 | #include <linux/usb.h> |
48 | #include <linux/usb_usual.h> | 48 | #include <linux/usb_usual.h> |
49 | #include <linux/blkdev.h> | 49 | #include <linux/blkdev.h> |
50 | #include <linux/smp_lock.h> | ||
51 | #include <linux/completion.h> | 50 | #include <linux/completion.h> |
52 | #include <linux/mutex.h> | 51 | #include <linux/mutex.h> |
53 | #include <scsi/scsi_host.h> | 52 | #include <scsi/scsi_host.h> |