diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-10 13:48:16 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-06-22 23:55:48 -0700 |
| commit | 2178db65cd9c81c790cbf7504e90650750c3b467 (patch) | |
| tree | 44ebe7390115cd7ecd8ea0ab281cb8881ca6ab0a /drivers/input | |
| parent | dfad2b17935d70d7dc3830c4986344b3f2669c62 (diff) | |
| download | lwn-2178db65cd9c81c790cbf7504e90650750c3b467.tar.gz lwn-2178db65cd9c81c790cbf7504e90650750c3b467.zip | |
Input: iforce - drop bus type from iforce structure
It is not needed anymore as behavior is controlled by the transport
operations set up for given device.
Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-serio.c | 1 | ||||
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-usb.c | 1 | ||||
| -rw-r--r-- | drivers/input/joystick/iforce/iforce.h | 5 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c index c73d988cbc92..277522d0f324 100644 --- a/drivers/input/joystick/iforce/iforce-serio.c +++ b/drivers/input/joystick/iforce/iforce-serio.c @@ -214,7 +214,6 @@ static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv) iforce = &iforce_serio->iforce; iforce->xport_ops = &iforce_serio_xport_ops; - iforce->bus = IFORCE_232; iforce_serio->serio = serio; serio_set_drvdata(serio, iforce_serio); diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index d85258b50be2..ae2dd5b5a416 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -234,7 +234,6 @@ static int iforce_usb_probe(struct usb_interface *intf, iforce = &iforce_usb->iforce; iforce->xport_ops = &iforce_usb_xport_ops; - iforce->bus = IFORCE_USB; iforce_usb->usbdev = dev; iforce_usb->intf = intf; diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h index 180de7a3f3a1..3e91cc381488 100644 --- a/drivers/input/joystick/iforce/iforce.h +++ b/drivers/input/joystick/iforce/iforce.h @@ -38,10 +38,6 @@ #define IFORCE_MAX_LENGTH 16 -/* iforce::bus */ -#define IFORCE_232 1 -#define IFORCE_USB 2 - #define IFORCE_EFFECTS_MAX 32 /* Each force feedback effect is made of one core effect, which can be @@ -105,7 +101,6 @@ struct iforce { struct input_dev *dev; /* Input device interface */ struct iforce_device *type; const struct iforce_xport_ops *xport_ops; - int bus; spinlock_t xmit_lock; /* Buffer used for asynchronous sending of bytes to the device */ |