summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/iforce/iforce-usb.c
diff options
context:
space:
mode:
authorDmitry Torokhov2018-08-10 22:52:31 +0200
committerDmitry Torokhov2019-06-23 08:55:49 +0200
commit8624dfd10a3bb3ea3d8a959e17f8951f1b03d68d (patch)
treed461159bb29327bc4945e2f6019ff29577c1d0f8 /drivers/input/joystick/iforce/iforce-usb.c
parentInput: iforce - drop bus type from iforce structure (diff)
downloadkernel-qcow2-linux-8624dfd10a3bb3ea3d8a959e17f8951f1b03d68d.tar.gz
kernel-qcow2-linux-8624dfd10a3bb3ea3d8a959e17f8951f1b03d68d.tar.xz
kernel-qcow2-linux-8624dfd10a3bb3ea3d8a959e17f8951f1b03d68d.zip
Input: iforce - drop couple of temps from transport code
Transport initialization code now deals mostly with transport-specific data, so we can drop couple of temporary variables. Tested-by: Tim Schumacher <timschumi@gmx.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-usb.c')
-rw-r--r--drivers/input/joystick/iforce/iforce-usb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index ae2dd5b5a416..a1e670781441 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -208,7 +208,6 @@ static int iforce_usb_probe(struct usb_interface *intf,
struct usb_host_interface *interface;
struct usb_endpoint_descriptor *epirq, *epout;
struct iforce_usb *iforce_usb;
- struct iforce *iforce;
int err = -ENOMEM;
interface = intf->cur_altsetting;
@@ -231,9 +230,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
if (!iforce_usb->out)
goto fail;
- iforce = &iforce_usb->iforce;
-
- iforce->xport_ops = &iforce_usb_xport_ops;
+ iforce_usb->iforce.xport_ops = &iforce_usb_xport_ops;
iforce_usb->usbdev = dev;
iforce_usb->intf = intf;
@@ -248,7 +245,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
iforce_usb->data_out, sizeof(iforce_usb->data_out),
iforce_usb_out, iforce_usb, epout->bInterval);
- err = iforce_init_device(&intf->dev, BUS_USB, iforce);
+ err = iforce_init_device(&intf->dev, BUS_USB, &iforce_usb->iforce);
if (err)
goto fail;