aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/iforce/iforce.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-08-03 16:27:45 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-06-22 23:55:19 -0700
commit81fd43132684605b21600fa5e27f23034e18dfd3 (patch)
tree31c041ee27cc4e7e85d34f7a31ed0c106a77dc81 /drivers/input/joystick/iforce/iforce.h
parentInput: iforce - add bus type and parent arguments to iforce_init_device() (diff)
downloadlinux-dev-81fd43132684605b21600fa5e27f23034e18dfd3.tar.xz
linux-dev-81fd43132684605b21600fa5e27f23034e18dfd3.zip
Input: iforce - move transport data into transport modules
This moves transport-specific data from main iforce structure into transport modules. Tested-by: Tim Schumacher <timschumi@gmx.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to '')
-rw-r--r--drivers/input/joystick/iforce/iforce.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 3ee9245a415b..d9712c48ba74 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -111,19 +111,7 @@ struct iforce {
unsigned char data[IFORCE_MAX_LENGTH];
unsigned char edata[IFORCE_MAX_LENGTH];
u16 ecmd;
- u16 expect_packet;
-
-#ifdef CONFIG_JOYSTICK_IFORCE_232
- struct serio *serio; /* RS232 transfer */
- int idx, pkt, len, id;
- unsigned char csum;
-#endif
-#ifdef CONFIG_JOYSTICK_IFORCE_USB
- struct usb_device *usbdev; /* USB transfer */
- struct usb_interface *intf;
- struct urb *irq, *out, *ctrl;
- struct usb_ctrlrequest cr;
-#endif
+
spinlock_t xmit_lock;
/* Buffer used for asynchronous sending of bytes to the device */
struct circ_buf xmit;