Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2178db65 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarTim Schumacher <timschumi@gmx.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent dfad2b17

drivers/input/joystick/iforce/iforce-serio.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/input/joystick/iforce/iforce-usb.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/input/joystick/iforce/iforce.h

+0 −5
Original line number Diff line number Diff line
@@ -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 */