HID: move usbhid flags to usbhid.h

Move usbhid specific flags from global hid.h into local usbhid.h.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index 332abcdf9956468ebf9b3aec792a716125b62f6c..9eb30564be9c0c8fba2d92ccb958ba3ed6c08913 100644 (file)
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -40,6 +40,16 @@ int usbhid_open(struct hid_device *hid);
 void usbhid_init_reports(struct hid_device *hid);
 void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, unsigned char dir);
 
+/* iofl flags */
+#define HID_CTRL_RUNNING       1
+#define HID_OUT_RUNNING                2
+#define HID_IN_RUNNING         3
+#define HID_RESET_PENDING      4
+#define HID_SUSPENDED          5
+#define HID_CLEAR_HALT         6
+#define HID_DISCONNECTED       7
+#define HID_STARTED            8
+
 /*
  * USB-specific HID struct, to be pointed to
  * from struct hid_device->driver_data

diff --git a/include/linux/hid.h b/include/linux/hid.h
index e5780f8c934a5a5ef00a9ab9b952ab682388c5ba..2c20f20283b2e7403e8dfad9d8096b24d4d5c9f4 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -403,15 +403,6 @@ struct hid_output_fifo {
 #define HID_STAT_ADDED         1
 #define HID_STAT_PARSED                2
 
-#define HID_CTRL_RUNNING       1
-#define HID_OUT_RUNNING                2
-#define HID_IN_RUNNING         3
-#define HID_RESET_PENDING      4
-#define HID_SUSPENDED          5
-#define HID_CLEAR_HALT         6
-#define HID_DISCONNECTED       7
-#define HID_STARTED            8
-
 struct hid_input {
        struct list_head list;
        struct hid_report *report;