Commit cd84ec96 authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman
Browse files

staging/usbip: change usbip to include new uapi usbip.h 



usbip userspace has duplicated enum definition to report usbip device
status maintained by the kernel. A new uapi usbip.h now defines the
usbip device status for kernel and userspace to use. Change usbip
kernel space to include uapi usbip.h for usbip device status.

Signed-off-by: default avatarShuah Khan <shuah.kh@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78a10b81

drivers/staging/usbip/usbip_common.h

+2 −17
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/types.h>

#include <linux/usb.h>

#include <linux/wait.h>

#include "uapi/usbip.h"



#define USBIP_VERSION "1.0.0"
@@ -235,22 +236,6 @@ enum usbip_side { 
	USBIP_STUB,

};



enum usbip_status {

	/* sdev is available. */

	SDEV_ST_AVAILABLE = 0x01,

	/* sdev is now used. */

	SDEV_ST_USED,

	/* sdev is unusable because of a fatal error. */

	SDEV_ST_ERROR,



	/* vdev does not connect a remote device. */

	VDEV_ST_NULL,

	/* vdev is used, but the USB address is not assigned yet */

	VDEV_ST_NOTASSIGNED,

	VDEV_ST_USED,

	VDEV_ST_ERROR

};



/* event handler */

#define USBIP_EH_SHUTDOWN	(1 << 0)

#define USBIP_EH_BYE		(1 << 1)
@@ -271,7 +256,7 @@ enum usbip_status { 
/* a common structure for stub_device and vhci_device */

struct usbip_device {

	enum usbip_side side;

	enum usbip_status status;

	enum usbip_device_status status;



	/* lock for status */

	spinlock_t lock;