From: Shuah Khan <shuah.kh@samsung.com>
To: gregkh@linuxfoundation.org, ly80toro@cip.cs.fau.de,
andy.grover@gmail.com, valentina.manea.m@gmail.com
Cc: Shuah Khan <shuah.kh@samsung.com>,
linux-usb@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, shuahkhan@gmail.com
Subject: [PATCH 2/3] staging/usbip: change usbip to include new uapi usbip.h
Date: Thu, 27 Feb 2014 17:27:26 -0700 [thread overview]
Message-ID: <dbbe5fffc27bf23cfffa99ea3d048ea75aa4e536.1393542201.git.shuah.kh@samsung.com> (raw)
In-Reply-To: <cover.1393542201.git.shuah.kh@samsung.com>
In-Reply-To: <cover.1393542201.git.shuah.kh@samsung.com>
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: Shuah Khan <shuah.kh@samsung.com>
---
drivers/staging/usbip/usbip_common.h | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 7e6c543..846ef5b 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -29,6 +29,7 @@
#include <linux/types.h>
#include <linux/usb.h>
#include <linux/wait.h>
+#include <uapi/linux/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;
--
1.7.10.4
next prev parent reply other threads:[~2014-02-28 0:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 0:27 [PATCH 0/3] staging/usbip: add new uapi header usbip.h Shuah Khan
2014-02-28 0:27 ` [PATCH 1/3] staging/usbip: add uapi header to export usbip kernel interfaces Shuah Khan
2014-02-28 22:15 ` Greg KH
2014-02-28 22:45 ` Shuah Khan
2014-02-28 0:27 ` Shuah Khan [this message]
2014-02-28 0:27 ` [PATCH 3/3] staging/usbip: change usbip userspace to include new uapi usbip.h Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dbbe5fffc27bf23cfffa99ea3d048ea75aa4e536.1393542201.git.shuah.kh@samsung.com \
--to=shuah.kh@samsung.com \
--cc=andy.grover@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ly80toro@cip.cs.fau.de \
--cc=shuahkhan@gmail.com \
--cc=valentina.manea.m@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).