[PATCH] staging/usbip: Change userspace to use linux include for usb_device_speed enum

[PATCH] staging/usbip: Change userspace to use linux include for usb_device_speed enum

[Shuah Khan]

Remove usb_device_speed enum define from usbip_common.h and change it to
include linux/usb/ch9.h instead.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
---
 drivers/staging/usbip/userspace/libsrc/usbip_common.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
index 938ad1c..2cb81b3 100644
--- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h
+++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
@@ -14,6 +14,7 @@
 
 #include <syslog.h>
 #include <unistd.h>
+#include <linux/usb/ch9.h>
 
 #ifndef USBIDS_FILE
 #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
@@ -76,13 +77,6 @@ extern int usbip_use_debug ;
 		abort();				\
 	} while (0)
 
-enum usb_device_speed {
-	USB_SPEED_UNKNOWN = 0,                  /* enumerating */
-	USB_SPEED_LOW, USB_SPEED_FULL,          /* usb 1.1 */
-	USB_SPEED_HIGH,                         /* usb 2.0 */
-	USB_SPEED_VARIABLE                      /* wireless (usb 2.5) */
-};
-
 /* FIXME: how to sync with drivers/usbip_common.h ? */
 enum usbip_device_status {
 	/* sdev is available. */
-- 
1.8.3.2

Re: [PATCH] staging/usbip: Change userspace to use linux include for usb_device_speed enum

[Shuah Khan]

On 01/22/2014 10:56 AM, Shuah Khan wrote:
> Remove usb_device_speed enum define from usbip_common.h and change it to
> include linux/usb/ch9.h instead.
>
> Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
> ---
>   drivers/staging/usbip/userspace/libsrc/usbip_common.h | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
> index 938ad1c..2cb81b3 100644
> --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h
> +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
> @@ -14,6 +14,7 @@
>
>   #include <syslog.h>
>   #include <unistd.h>
> +#include <linux/usb/ch9.h>
>
>   #ifndef USBIDS_FILE
>   #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
> @@ -76,13 +77,6 @@ extern int usbip_use_debug ;
>   		abort();				\
>   	} while (0)
>
> -enum usb_device_speed {
> -	USB_SPEED_UNKNOWN = 0,                  /* enumerating */
> -	USB_SPEED_LOW, USB_SPEED_FULL,          /* usb 1.1 */
> -	USB_SPEED_HIGH,                         /* usb 2.0 */
> -	USB_SPEED_VARIABLE                      /* wireless (usb 2.5) */
> -};
> -
>   /* FIXME: how to sync with drivers/usbip_common.h ? */
>   enum usbip_device_status {
>   	/* sdev is available. */
>

I just realized the following two userspace patches should be combined 
or sent as a series. I will send them together addressing Thomas 
Pugliese's review comments.

https://lkml.org/lkml/2014/1/22/336
https://lkml.org/lkml/2014/1/22/420

-- Shuah

-- 
Shuah Khan
Senior Linux Kernel Developer - Open Source Group
Samsung Research America(Silicon Valley)
shuah.kh@samsung.com | (970) 672-0658