diff options
| author | Eric Lescouet <Eric.Lescouet@virtuallogix.com> | 2010-04-24 17:21:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:30 -0400 |
| commit | 27729aadd31dafddaaf64c24f8ef6d0ff750f3aa (patch) | |
| tree | 20499b4132eaad36fb177b028600694fc4d0626a | |
| parent | 44ebd037c54f80db3121ac9f5fe6e677b76e11d5 (diff) | |
USB: make hcd.h public (drivers dependency)
The usbcore headers: hcd.h and hub.h are shared between usbcore,
HCDs and a couple of other drivers (e.g. USBIP modules).
So, it makes sense to move them into a more public location and
to cleanup dependency of those modules on kernel internal headers.
This patch moves hcd.h from drivers/usb/core into include/linux/usb/
Signed-of-by: Eric Lescouet <eric@lescouet.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
43 files changed, 46 insertions, 52 deletions
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index bc2674086673..da30658fa048 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 23 | #include "stub.h" | 23 | #include "stub.h" |
| 24 | #include "../../usb/core/hcd.h" | 24 | #include <linux/usb/hcd.h> |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | static int is_clear_halt_cmd(struct urb *urb) | 27 | static int is_clear_halt_cmd(struct urb *urb) |
diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h index 5e375173bbce..41a1fe5138f4 100644 --- a/drivers/staging/usbip/vhci.h +++ b/drivers/staging/usbip/vhci.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include "../../usb/core/hcd.h" | 21 | #include <linux/usb/hcd.h> |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | struct vhci_device { | 24 | struct vhci_device { |
diff --git a/drivers/usb/c67x00/c67x00-hcd.h b/drivers/usb/c67x00/c67x00-hcd.h index e8c6d94b2514..74e44621e313 100644 --- a/drivers/usb/c67x00/c67x00-hcd.h +++ b/drivers/usb/c67x00/c67x00-hcd.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
| 29 | #include <linux/list.h> | 29 | #include <linux/list.h> |
| 30 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |
| 31 | #include "../core/hcd.h" | 31 | #include <linux/usb/hcd.h> |
| 32 | #include "c67x00.h" | 32 | #include "c67x00.h" |
| 33 | 33 | ||
| 34 | /* | 34 | /* |
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c index 3ba2fff71490..2c6965484fe8 100644 --- a/drivers/usb/core/buffer.c +++ b/drivers/usb/core/buffer.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/dma-mapping.h> | 14 | #include <linux/dma-mapping.h> |
| 15 | #include <linux/dmapool.h> | 15 | #include <linux/dmapool.h> |
| 16 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 17 | #include "hcd.h" | 17 | #include <linux/usb/hcd.h> |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | /* | 20 | /* |
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 0d3af6a6ee49..77e0dda3a2fb 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c | |||
| @@ -1,12 +1,13 @@ | |||
| 1 | #include <linux/usb.h> | 1 | #include <linux/usb.h> |
| 2 | #include <linux/usb/ch9.h> | 2 | #include <linux/usb/ch9.h> |
| 3 | #include <linux/usb/hcd.h> | ||
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 4 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 5 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
| 6 | #include <linux/device.h> | 7 | #include <linux/device.h> |
| 7 | #include <asm/byteorder.h> | 8 | #include <asm/byteorder.h> |
| 8 | #include "usb.h" | 9 | #include "usb.h" |
| 9 | #include "hcd.h" | 10 | |
| 10 | 11 | ||
| 11 | #define USB_MAXALTSETTING 128 /* Hard limit */ | 12 | #define USB_MAXALTSETTING 128 /* Hard limit */ |
| 12 | #define USB_MAXENDPOINTS 30 /* Hard limit */ | 13 | #define USB_MAXENDPOINTS 30 /* Hard limit */ |
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index 19bc03a9fecf..75077215a8b8 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c | |||
| @@ -55,11 +55,11 @@ | |||
| 55 | #include <linux/usb.h> | 55 | #include <linux/usb.h> |
| 56 | #include <linux/smp_lock.h> | 56 | #include <linux/smp_lock.h> |
| 57 | #include <linux/usbdevice_fs.h> | 57 | #include <linux/usbdevice_fs.h> |
| 58 | #include <linux/usb/hcd.h> | ||
| 58 | #include <linux/mutex.h> | 59 | #include <linux/mutex.h> |
| 59 | #include <asm/uaccess.h> | 60 | #include <asm/uaccess.h> |
| 60 | 61 | ||
| 61 | #include "usb.h" | 62 | #include "usb.h" |
| 62 | #include "hcd.h" | ||
| 63 | 63 | ||
| 64 | /* Define ALLOW_SERIAL_NUMBER if you want to see the serial number of devices */ | 64 | /* Define ALLOW_SERIAL_NUMBER if you want to see the serial number of devices */ |
| 65 | #define ALLOW_SERIAL_NUMBER | 65 | #define ALLOW_SERIAL_NUMBER |
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 3466fdc5bb11..c2f62a3993d2 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 44 | #include <linux/usb.h> | 44 | #include <linux/usb.h> |
| 45 | #include <linux/usbdevice_fs.h> | 45 | #include <linux/usbdevice_fs.h> |
| 46 | #include <linux/usb/hcd.h> /* for usbcore internals */ | ||
| 46 | #include <linux/cdev.h> | 47 | #include <linux/cdev.h> |
| 47 | #include <linux/notifier.h> | 48 | #include <linux/notifier.h> |
| 48 | #include <linux/security.h> | 49 | #include <linux/security.h> |
| @@ -50,9 +51,7 @@ | |||
| 50 | #include <asm/byteorder.h> | 51 | #include <asm/byteorder.h> |
| 51 | #include <linux/moduleparam.h> | 52 | #include <linux/moduleparam.h> |
| 52 | 53 | ||
| 53 | #include "hcd.h" /* for usbcore internals */ | ||
| 54 | #include "usb.h" | 54 | #include "usb.h" |
| 55 | #include "hub.h" | ||
| 56 | 55 | ||
| 57 | #define USB_MAXBUS 64 | 56 | #define USB_MAXBUS 64 |
| 58 | #define USB_DEVICE_MAX USB_MAXBUS * 128 | 57 | #define USB_DEVICE_MAX USB_MAXBUS * 128 |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 2f3dc4cdf79b..edff55a32575 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -26,8 +26,9 @@ | |||
| 26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
| 27 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 28 | #include <linux/usb/quirks.h> | 28 | #include <linux/usb/quirks.h> |
| 29 | #include <linux/usb/hcd.h> | ||
| 29 | #include <linux/pm_runtime.h> | 30 | #include <linux/pm_runtime.h> |
