openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dmitry Torokhov 2018-08-10 13:52:31 -07:00
parent 2178db65cd
commit 8624dfd10a
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,16 +204,13 @@ static irqreturn_t iforce_serio_irq(struct serio *serio,
static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
{
struct iforce_serio *iforce_serio;
struct iforce *iforce;
int err;
iforce_serio = kzalloc(sizeof(*iforce_serio), GFP_KERNEL);
if (!iforce_serio)
return -ENOMEM;
iforce = &iforce_serio->iforce;
iforce->xport_ops = &iforce_serio_xport_ops;
iforce_serio->iforce.xport_ops = &iforce_serio_xport_ops;
iforce_serio->serio = serio;
serio_set_drvdata(serio, iforce_serio);
@ -222,7 +219,7 @@ static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
if (err)
goto fail1;
err = iforce_init_device(&serio->dev, BUS_RS232, iforce);
err = iforce_init_device(&serio->dev, BUS_RS232, &iforce_serio->iforce);
if (err)
goto fail2;

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

@ -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;