hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dmitry Torokhov 2018-08-10 13:48:16 -07:00
parent dfad2b1793
commit 2178db65cd
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/input/joystick/iforce/iforce-serio.c
View File

@ -214,7 +214,6 @@ static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
iforce = &iforce_serio->iforce; iforce = &iforce_serio->iforce;
iforce->xport_ops = &iforce_serio_xport_ops; iforce->xport_ops = &iforce_serio_xport_ops;
iforce->bus = IFORCE_232;
iforce_serio->serio = serio; iforce_serio->serio = serio;
serio_set_drvdata(serio, iforce_serio); serio_set_drvdata(serio, iforce_serio);

1
drivers/input/joystick/iforce/iforce-usb.c
View File

@ -234,7 +234,6 @@ static int iforce_usb_probe(struct usb_interface *intf,
iforce = &iforce_usb->iforce; iforce = &iforce_usb->iforce;
iforce->xport_ops = &iforce_usb_xport_ops; iforce->xport_ops = &iforce_usb_xport_ops;
iforce->bus = IFORCE_USB;
iforce_usb->usbdev = dev; iforce_usb->usbdev = dev;
iforce_usb->intf = intf; iforce_usb->intf = intf;

5
drivers/input/joystick/iforce/iforce.h
View File

@ -38,10 +38,6 @@
#define IFORCE_MAX_LENGTH 16 #define IFORCE_MAX_LENGTH 16
/* iforce::bus */
#define IFORCE_232 1
#define IFORCE_USB 2
#define IFORCE_EFFECTS_MAX 32 #define IFORCE_EFFECTS_MAX 32
/* Each force feedback effect is made of one core effect, which can be /* 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 input_dev *dev; /* Input device interface */
struct iforce_device *type; struct iforce_device *type;
const struct iforce_xport_ops *xport_ops; const struct iforce_xport_ops *xport_ops;
int bus;
spinlock_t xmit_lock; spinlock_t xmit_lock;
/* Buffer used for asynchronous sending of bytes to the device */ /* Buffer used for asynchronous sending of bytes to the device */