diff options
author | matt mooney <mfm@muteddisk.com> | 2011-05-11 22:33:43 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-12 09:17:56 -0700 |
commit | 7aaacb43ed97714ff0f7f77f306f24b6e564ad03 (patch) | |
tree | 60f25e8b247ca6f296f9e4456da48db8222d061a /drivers/staging/usbip | |
parent | fc184a35d90927fb82a13043a95c5420335ab824 (diff) | |
download | linux-3.10-7aaacb43ed97714ff0f7f77f306f24b6e564ad03.tar.gz linux-3.10-7aaacb43ed97714ff0f7f77f306f24b6e564ad03.tar.bz2 linux-3.10-7aaacb43ed97714ff0f7f77f306f24b6e564ad03.zip |
staging: usbip: fix header includes
Modify header directives to include what is needed by each file and
not already included in its own header.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/usbip')
-rw-r--r-- | drivers/staging/usbip/stub.h | 9 | ||||
-rw-r--r-- | drivers/staging/usbip/stub_dev.c | 2 | ||||
-rw-r--r-- | drivers/staging/usbip/stub_main.c | 2 | ||||
-rw-r--r-- | drivers/staging/usbip/stub_rx.c | 5 | ||||
-rw-r--r-- | drivers/staging/usbip/stub_tx.c | 2 | ||||
-rw-r--r-- | drivers/staging/usbip/usbip_common.c | 8 | ||||
-rw-r--r-- | drivers/staging/usbip/usbip_common.h | 16 | ||||
-rw-r--r-- | drivers/staging/usbip/usbip_event.c | 1 | ||||
-rw-r--r-- | drivers/staging/usbip/vhci.h | 8 | ||||
-rw-r--r-- | drivers/staging/usbip/vhci_hcd.c | 6 | ||||
-rw-r--r-- | drivers/staging/usbip/vhci_rx.c | 2 | ||||
-rw-r--r-- | drivers/staging/usbip/vhci_sysfs.c | 5 | ||||
-rw-r--r-- | drivers/staging/usbip/vhci_tx.c | 2 |
13 files changed, 42 insertions, 26 deletions
diff --git a/drivers/staging/usbip/stub.h b/drivers/staging/usbip/stub.h index cd3a5bf825c..6592aa2ad15 100644 --- a/drivers/staging/usbip/stub.h +++ b/drivers/staging/usbip/stub.h @@ -17,13 +17,12 @@ * USA. */ -#include <linux/kernel.h> #include <linux/list.h> -#include <linux/spinlock.h> #include <linux/slab.h> -#include <linux/string.h> -#include <linux/module.h> -#include <linux/net.h> +#include <linux/spinlock.h> +#include <linux/types.h> +#include <linux/usb.h> +#include <linux/wait.h> #define STUB_BUSID_OTHER 0 #define STUB_BUSID_REMOV 1 diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c index 919d5582f22..c71d0a302a8 100644 --- a/drivers/staging/usbip/stub_dev.c +++ b/drivers/staging/usbip/stub_dev.c @@ -17,7 +17,7 @@ * USA. */ -#include <linux/slab.h> +#include <linux/device.h> #include <linux/kthread.h> #include "usbip_common.h" diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index a3c73b2fd28..1f8fc5e8eef 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -17,7 +17,7 @@ * USA. */ -#include <linux/slab.h> +#include <linux/string.h> #include "usbip_common.h" #include "stub.h" diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index e11ac2a5c64..e24560929a8 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c @@ -17,12 +17,13 @@ * USA. */ -#include <linux/slab.h> +#include <asm/byteorder.h> #include <linux/kthread.h> +#include <linux/usb.h> +#include <linux/usb/hcd.h> #include "usbip_common.h" #include "stub.h" -#include <linux/usb/hcd.h> static int is_clear_halt_cmd(struct urb *urb) { diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c index fc022612751..3c332c2dfd8 100644 --- a/drivers/staging/usbip/stub_tx.c +++ b/drivers/staging/usbip/stub_tx.c @@ -17,8 +17,8 @@ * USA. */ -#include <linux/slab.h> #include <linux/kthread.h> +#include <linux/socket.h> #include "usbip_common.h" #include "stub.h" diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index 6c44fa4aebe..fb95edfc7e1 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -17,12 +17,12 @@ * USA. */ -#include <linux/kernel.h> +#include <asm/byteorder.h> #include <linux/file.h> -#include <linux/tcp.h> -#include <linux/in.h> -#include <linux/kthread.h> +#include <linux/fs.h> +#include <linux/kernel.h> #include <linux/slab.h> +#include <net/sock.h> #include "usbip_common.h" diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h index aa5d576abb6..fd84ab2f9c2 100644 --- a/drivers/staging/usbip/usbip_common.h +++ b/drivers/staging/usbip/usbip_common.h @@ -17,14 +17,18 @@ * USA. */ -#ifndef __VHCI_COMMON_H -#define __VHCI_COMMON_H +#ifndef __USBIP_COMMON_H +#define __USBIP_COMMON_H -#include <linux/version.h> #include <linux/compiler.h> +#include <linux/device.h> +#include <linux/interrupt.h> +#include <linux/net.h> +#include <linux/printk.h> +#include <linux/spinlock.h> +#include <linux/types.h> #include <linux/usb.h> -#include <asm/byteorder.h> -#include <net/sock.h> +#include <linux/wait.h> #define USBIP_VERSION "1.0.0" @@ -366,4 +370,4 @@ void usbip_stop_eh(struct usbip_device *ud); void usbip_event_add(struct usbip_device *ud, unsigned long event); int usbip_event_happened(struct usbip_device *ud); -#endif +#endif /* __USBIP_COMMON_H */ diff --git a/drivers/staging/usbip/usbip_event.c b/drivers/staging/usbip/usbip_event.c index 8861e3ba005..da6074daf1f 100644 --- a/drivers/staging/usbip/usbip_event.c +++ b/drivers/staging/usbip/usbip_event.c @@ -18,6 +18,7 @@ */ #include <linux/kthread.h> + #include "usbip_common.h" static int event_handler(struct usbip_device *ud) diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h index d745c4ebd05..d5bc8e7e3d7 100644 --- a/drivers/staging/usbip/vhci.h +++ b/drivers/staging/usbip/vhci.h @@ -17,8 +17,14 @@ * USA. */ -#include <linux/platform_device.h> +#include <linux/device.h> +#include <linux/list.h> +#include <linux/spinlock.h> +#include <linux/sysfs.h> +#include <linux/types.h> +#include <linux/usb.h> #include <linux/usb/hcd.h> +#include <linux/wait.h> struct vhci_device { struct usb_device *udev; diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index 7372d4d0103..facd58ece53 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -17,8 +17,12 @@ * USA. */ -#include <linux/slab.h> +#include <linux/init.h> +#include <linux/kernel.h> #include <linux/kthread.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> #include "usbip_common.h" #include "vhci.h" diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c index fedc442d873..2fe6cbf6202 100644 --- a/drivers/staging/usbip/vhci_rx.c +++ b/drivers/staging/usbip/vhci_rx.c @@ -17,8 +17,8 @@ * USA. */ -#include <linux/slab.h> #include <linux/kthread.h> +#include <linux/slab.h> #include "usbip_common.h" #include "vhci.h" diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index 4acded46fdf..a684f225844 100644 --- a/drivers/staging/usbip/vhci_sysfs.c +++ b/drivers/staging/usbip/vhci_sysfs.c @@ -17,11 +17,12 @@ * USA. */ +#include <linux/kthread.h> +#include <linux/net.h> + #include "usbip_common.h" #include "vhci.h" -#include <linux/in.h> - /* TODO: refine locking ?*/ /* Sysfs entry to show port status */ diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/staging/usbip/vhci_tx.c index 62c9acb67fc..c1aa03bf246 100644 --- a/drivers/staging/usbip/vhci_tx.c +++ b/drivers/staging/usbip/vhci_tx.c @@ -17,8 +17,8 @@ * USA. */ -#include <linux/slab.h> #include <linux/kthread.h> +#include <linux/slab.h> #include "usbip_common.h" #include "vhci.h" |