Input: iforce - move transport data into transport modules

This moves transport-specific data from main iforce structure into
transport modules.

Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index b5dea27..6ff1bbe 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -23,8 +23,20 @@
 
 #include "iforce.h"
 
+struct iforce_serio {
+       struct iforce iforce;
+
+       struct serio *serio;
+       int idx, pkt, len, id;
+       u8 csum;
+       u8 expect_packet;
+};
+
 static void iforce_serio_xmit(struct iforce *iforce)
 {
+       struct iforce_serio *iforce_serio = container_of(iforce,
+                                                        struct iforce_serio,
+                                                        iforce);
        unsigned char cs;
        int i;
        unsigned long flags;
@@ -45,19 +57,20 @@ again:
 
        cs = 0x2b;
 
-       serio_write(iforce->serio, 0x2b);
+       serio_write(iforce_serio->serio, 0x2b);
 
-       serio_write(iforce->serio, iforce->xmit.buf[iforce->xmit.tail]);
+       serio_write(iforce_serio->serio, iforce->xmit.buf[iforce->xmit.tail]);
        cs ^= iforce->xmit.buf[iforce->xmit.tail];
        XMIT_INC(iforce->xmit.tail, 1);
 
        for (i=iforce->xmit.buf[iforce->xmit.tail]; i >= 0; --i) {
-               serio_write(iforce->serio, iforce->xmit.buf[iforce->xmit.tail]);
+               serio_write(iforce_serio->serio,
+                           iforce->xmit.buf[iforce->xmit.tail]);
                cs ^= iforce->xmit.buf[iforce->xmit.tail];
                XMIT_INC(iforce->xmit.tail, 1);
        }
 
-       serio_write(iforce->serio, cs);
+       serio_write(iforce_serio->serio, cs);
 
        if (test_and_clear_bit(IFORCE_XMIT_AGAIN, iforce->xmit_flags))
                goto again;
@@ -69,14 +82,18 @@ again:
 
 static int iforce_serio_get_id(struct iforce *iforce, u8 *packet)
 {
-       iforce->expect_packet = FF_CMD_QUERY;
+       struct iforce_serio *iforce_serio = container_of(iforce,
+                                                        struct iforce_serio,
+                                                        iforce);
+
+       iforce_serio->expect_packet = HI(FF_CMD_QUERY);
        iforce_send_packet(iforce, FF_CMD_QUERY, packet);
 
        wait_event_interruptible_timeout(iforce->wait,
-                                        !iforce->expect_packet, HZ);
+                                        !iforce_serio->expect_packet, HZ);
 
-       if (iforce->expect_packet) {
-               iforce->expect_packet = 0;
+       if (iforce_serio->expect_packet) {
+               iforce_serio->expect_packet = 0;
                return -EIO;
        }
 
@@ -111,54 +128,56 @@ static void iforce_serio_write_wakeup(struct serio *serio)
 static irqreturn_t iforce_serio_irq(struct serio *serio,
                unsigned char data, unsigned int flags)
 {
-       struct iforce *iforce = serio_get_drvdata(serio);
+       struct iforce_serio *iforce_serio = serio_get_drvdata(serio);
+       struct iforce *iforce = &iforce_serio->iforce;
 
-       if (!iforce->pkt) {
+       if (!iforce_serio->pkt) {
                if (data == 0x2b)
-                       iforce->pkt = 1;
+                       iforce_serio->pkt = 1;
                goto out;
        }
 
-       if (!iforce->id) {
+       if (!iforce_serio->id) {
                if (data > 3 && data != 0xff)
-                       iforce->pkt = 0;
+                       iforce_serio->pkt = 0;
                else
-                       iforce->id = data;
+                       iforce_serio->id = data;
                goto out;
        }
 
-       if (!iforce->len) {
+       if (!iforce_serio->len) {
                if (data > IFORCE_MAX_LENGTH) {
-                       iforce->pkt = 0;
-                       iforce->id = 0;
+                       iforce_serio->pkt = 0;
+                       iforce_serio->id = 0;
                } else {
-                       iforce->len = data;
+                       iforce_serio->len = data;
                }
                goto out;
        }
 
-       if (iforce->idx < iforce->len) {
-               iforce->csum += iforce->data[iforce->idx++] = data;
+       if (iforce_serio->idx < iforce_serio->len) {
+               iforce->data[iforce_serio->idx++] = data;
+               iforce_serio->csum += data;
                goto out;
        }
 
-       if (iforce->idx == iforce->len) {
-               u16 cmd = (iforce->id << 8) | iforce->idx;
+       if (iforce_serio->idx == iforce_serio->len) {
+               u16 cmd = (iforce_serio->id << 8) | iforce_serio->idx;
 
                /* Handle command completion */
-               if (HI(iforce->expect_packet) == HI(cmd)) {
-                       iforce->expect_packet = 0;
+               if (iforce_serio->expect_packet == iforce_serio->id) {
+                       iforce_serio->expect_packet = 0;
                        iforce->ecmd = cmd;
                        memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH);
                }
 
                iforce_process_packet(iforce, cmd, iforce->data);
 
-               iforce->pkt = 0;
-               iforce->id  = 0;
-               iforce->len = 0;
-               iforce->idx = 0;
-               iforce->csum = 0;
+               iforce_serio->pkt = 0;
+               iforce_serio->id  = 0;
+               iforce_serio->len = 0;
+               iforce_serio->idx = 0;
+               iforce_serio->csum = 0;
        }
 out:
        return IRQ_HANDLED;
@@ -166,18 +185,21 @@ out:
 
 static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
 {
+       struct iforce_serio *iforce_serio;
        struct iforce *iforce;
        int err;
 
-       iforce = kzalloc(sizeof(struct iforce), GFP_KERNEL);
-       if (!iforce)
+       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->bus = IFORCE_232;
-       iforce->serio = serio;
 
-       serio_set_drvdata(serio, iforce);
+       iforce_serio->serio = serio;
+       serio_set_drvdata(serio, iforce_serio);
 
        err = serio_open(serio, drv);
        if (err)
@@ -191,18 +213,18 @@ static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
 
  fail2:        serio_close(serio);
  fail1:        serio_set_drvdata(serio, NULL);
-       kfree(iforce);
+       kfree(iforce_serio);
        return err;
 }
 
 static void iforce_serio_disconnect(struct serio *serio)
 {
-       struct iforce *iforce = serio_get_drvdata(serio);
+       struct iforce_serio *iforce_serio = serio_get_drvdata(serio);
 
-       input_unregister_device(iforce->dev);
+       input_unregister_device(iforce_serio->iforce.dev);
        serio_close(serio);
        serio_set_drvdata(serio, NULL);
-       kfree(iforce);
+       kfree(iforce_serio);
 }
 
 static const struct serio_device_id iforce_serio_ids[] = {

diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 824df42..d4e7a24 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -23,8 +23,19 @@
 
 #include "iforce.h"
 
+struct iforce_usb {
+       struct iforce iforce;
+
+       struct usb_device *usbdev;
+       struct usb_interface *intf;
+       struct urb *irq, *out, *ctrl;
+       struct usb_ctrlrequest cr;
+};
+
 static void __iforce_usb_xmit(struct iforce *iforce)
 {
+       struct iforce_usb *iforce_usb = container_of(iforce, struct iforce_usb,
+                                                    iforce);
        int n, c;
        unsigned long flags;
 
@@ -36,31 +47,32 @@ static void __iforce_usb_xmit(struct iforce *iforce)
                return;
        }
 
-       ((char *)iforce->out->transfer_buffer)[0] = iforce->xmit.buf[iforce->xmit.tail];
+       ((char *)iforce_usb->out->transfer_buffer)[0] = iforce->xmit.buf[iforce->xmit.tail];
        XMIT_INC(iforce->xmit.tail, 1);
        n = iforce->xmit.buf[iforce->xmit.tail];
        XMIT_INC(iforce->xmit.tail, 1);
 
-       iforce->out->transfer_buffer_length = n + 1;
-       iforce->out->dev = iforce->usbdev;
+       iforce_usb->out->transfer_buffer_length = n + 1;
+       iforce_usb->out->dev = iforce_usb->usbdev;
 
        /* Copy rest of data then */
        c = CIRC_CNT_TO_END(iforce->xmit.head, iforce->xmit.tail, XMIT_SIZE);
        if (n < c) c=n;
 
-       memcpy(iforce->out->transfer_buffer + 1,
+       memcpy(iforce_usb->out->transfer_buffer + 1,
               &iforce->xmit.buf[iforce->xmit.tail],
               c);
        if (n != c) {
-               memcpy(iforce->out->transfer_buffer + 1 + c,
+               memcpy(iforce_usb->out->transfer_buffer + 1 + c,
                       &iforce->xmit.buf[0],
                       n-c);
        }
        XMIT_INC(iforce->xmit.tail, n);
 
-       if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {
+       if ( (n=usb_submit_urb(iforce_usb->out, GFP_ATOMIC)) ) {
                clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);
-               dev_warn(&iforce->intf->dev, "usb_submit_urb failed %d\n", n);
+               dev_warn(&iforce_usb->intf->dev,
+                        "usb_submit_urb failed %d\n", n);
        }
 
        /* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.
@@ -77,26 +89,28 @@ static void iforce_usb_xmit(struct iforce *iforce)
 
 static int iforce_usb_get_id(struct iforce *iforce, u8 *packet)
 {
+       struct iforce_usb *iforce_usb = container_of(iforce, struct iforce_usb,
+                                                    iforce);
        int status;
 
-       iforce->cr.bRequest = packet[0];
-       iforce->ctrl->dev = iforce->usbdev;
+       iforce_usb->cr.bRequest = packet[0];
+       iforce_usb->ctrl->dev = iforce_usb->usbdev;
 
-       status = usb_submit_urb(iforce->ctrl, GFP_KERNEL);
+       status = usb_submit_urb(iforce_usb->ctrl, GFP_KERNEL);
        if (status) {
-               dev_err(&iforce->intf->dev,
+               dev_err(&iforce_usb->intf->dev,
                        "usb_submit_urb failed %d\n", status);
                return -EIO;
        }
 
        wait_event_interruptible_timeout(iforce->wait,
-               iforce->ctrl->status != -EINPROGRESS, HZ);
+               iforce_usb->ctrl->status != -EINPROGRESS, HZ);
 
-       if (iforce->ctrl->status) {
-               dev_dbg(&iforce->intf->dev,
+       if (iforce_usb->ctrl->status) {
+               dev_dbg(&iforce_usb->intf->dev,
                        "iforce->ctrl->status = %d\n",
-                       iforce->ctrl->status);
-               usb_unlink_urb(iforce->ctrl);
+                       iforce_usb->ctrl->status);
+               usb_unlink_urb(iforce_usb->ctrl);
                return -EIO;
        }
 
@@ -105,7 +119,10 @@ static int iforce_usb_get_id(struct iforce *iforce, u8 *packet)
 
 static int iforce_usb_start_io(struct iforce *iforce)
 {
-       if (usb_submit_urb(iforce->irq, GFP_KERNEL))
+       struct iforce_usb *iforce_usb = container_of(iforce, struct iforce_usb,
+                                                    iforce);
+
+       if (usb_submit_urb(iforce_usb->irq, GFP_KERNEL))
                return -EIO;
 
        return 0;
@@ -113,9 +130,12 @@ static int iforce_usb_start_io(struct iforce *iforce)
 
 static void iforce_usb_stop_io(struct iforce *iforce)
 {
-       usb_kill_urb(iforce->irq);
-       usb_kill_urb(iforce->out);
-       usb_kill_urb(iforce->ctrl);
+       struct iforce_usb *iforce_usb = container_of(iforce, struct iforce_usb,
+                                                    iforce);
+
+       usb_kill_urb(iforce_usb->irq);
+       usb_kill_urb(iforce_usb->out);
+       usb_kill_urb(iforce_usb->ctrl);
 }
 
 static const struct iforce_xport_ops iforce_usb_xport_ops = {
@@ -127,8 +147,9 @@ static const struct iforce_xport_ops iforce_usb_xport_ops = {
 
 static void iforce_usb_irq(struct urb *urb)
 {
-       struct iforce *iforce = urb->context;
-       struct device *dev = &iforce->intf->dev;
+       struct iforce_usb *iforce_usb = urb->context;
+       struct iforce *iforce = &iforce_usb->iforce;
+       struct device *dev = &iforce_usb->intf->dev;
        int status;
 
        switch (urb->status) {
@@ -152,7 +173,7 @@ static void iforce_usb_irq(struct urb *urb)
                (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1);
 
 exit:
-       status = usb_submit_urb (urb, GFP_ATOMIC);
+       status = usb_submit_urb(urb, GFP_ATOMIC);
        if (status)
                dev_err(dev, "%s - usb_submit_urb failed with result %d\n",
                        __func__, status);
@@ -160,11 +181,12 @@ exit:
 
 static void iforce_usb_out(struct urb *urb)
 {
-       struct iforce *iforce = urb->context;
+       struct iforce_usb *iforce_usb = urb->context;
+       struct iforce *iforce = &iforce_usb->iforce;
 
        if (urb->status) {
                clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);
-               dev_dbg(&iforce->intf->dev, "urb->status %d, exiting\n",
+               dev_dbg(&iforce_usb->intf->dev, "urb->status %d, exiting\n",
                        urb->status);
                return;
        }
@@ -176,8 +198,12 @@ static void iforce_usb_out(struct urb *urb)
 
 static void iforce_usb_ctrl(struct urb *urb)
 {
-       struct iforce *iforce = urb->context;
-       if (urb->status) return;
+       struct iforce_usb *iforce_usb = urb->context;
+       struct iforce *iforce = &iforce_usb->iforce;
+
+       if (urb->status)
+               return;
+
        iforce->ecmd = 0xff00 | urb->actual_length;
        wake_up(&iforce->wait);
 }
@@ -188,6 +214,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
        struct usb_device *dev = interface_to_usbdev(intf);
        struct usb_host_interface *interface;
        struct usb_endpoint_descriptor *epirq, *epout;
+       struct iforce_usb *iforce_usb;
        struct iforce *iforce;
        int err = -ENOMEM;
 
@@ -199,49 +226,52 @@ static int iforce_usb_probe(struct usb_interface *intf,
        epirq = &interface->endpoint[0].desc;
        epout = &interface->endpoint[1].desc;
 
-       if (!(iforce = kzalloc(sizeof(struct iforce) + 32, GFP_KERNEL)))
+       if (!(iforce_usb = kzalloc(sizeof(*iforce_usb) + 32, GFP_KERNEL)))
                goto fail;
 
-       if (!(iforce->irq = usb_alloc_urb(0, GFP_KERNEL)))
+       if (!(iforce_usb->irq = usb_alloc_urb(0, GFP_KERNEL)))
                goto fail;
 
-       if (!(iforce->out = usb_alloc_urb(0, GFP_KERNEL)))
+       if (!(iforce_usb->out = usb_alloc_urb(0, GFP_KERNEL)))
                goto fail;
 
-       if (!(iforce->ctrl = usb_alloc_urb(0, GFP_KERNEL)))
+       if (!(iforce_usb->ctrl = usb_alloc_urb(0, GFP_KERNEL)))
                goto fail;
 
+       iforce = &iforce_usb->iforce;
+
        iforce->xport_ops = &iforce_usb_xport_ops;
        iforce->bus = IFORCE_USB;
-       iforce->usbdev = dev;
-       iforce->intf = intf;
 
-       iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
-       iforce->cr.wIndex = 0;
-       iforce->cr.wLength = cpu_to_le16(16);
+       iforce_usb->usbdev = dev;
+       iforce_usb->intf = intf;
+
+       iforce_usb->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
+       iforce_usb->cr.wIndex = 0;
+       iforce_usb->cr.wLength = cpu_to_le16(16);
 
-       usb_fill_int_urb(iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),
-                       iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval);
+       usb_fill_int_urb(iforce_usb->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),
+                       iforce->data, 16, iforce_usb_irq, iforce_usb, epirq->bInterval);
 
-       usb_fill_int_urb(iforce->out, dev, usb_sndintpipe(dev, epout->bEndpointAddress),
-                       iforce + 1, 32, iforce_usb_out, iforce, epout->bInterval);
+       usb_fill_int_urb(iforce_usb->out, dev, usb_sndintpipe(dev, epout->bEndpointAddress),
+                       iforce_usb + 1, 32, iforce_usb_out, iforce_usb, epout->bInterval);
 
-       usb_fill_control_urb(iforce->ctrl, dev, usb_rcvctrlpipe(dev, 0),
-                       (void*) &iforce->cr, iforce->edata, 16, iforce_usb_ctrl, iforce);
+       usb_fill_control_urb(iforce_usb->ctrl, dev, usb_rcvctrlpipe(dev, 0),
+                       (void*) &iforce_usb->cr, iforce->edata, 16, iforce_usb_ctrl, iforce_usb);
 
        err = iforce_init_device(&intf->dev, BUS_USB, iforce);
        if (err)
                goto fail;
 
-       usb_set_intfdata(intf, iforce);
+       usb_set_intfdata(intf, iforce_usb);
        return 0;
 
 fail:
-       if (iforce) {
-               usb_free_urb(iforce->irq);
-               usb_free_urb(iforce->out);
-               usb_free_urb(iforce->ctrl);
-               kfree(iforce);
+       if (iforce_usb) {
+               usb_free_urb(iforce_usb->irq);
+               usb_free_urb(iforce_usb->out);
+               usb_free_urb(iforce_usb->ctrl);
+               kfree(iforce_usb);
        }
 
        return err;
@@ -249,17 +279,17 @@ fail:
 
 static void iforce_usb_disconnect(struct usb_interface *intf)
 {
-       struct iforce *iforce = usb_get_intfdata(intf);
+       struct iforce_usb *iforce_usb = usb_get_intfdata(intf);
 
        usb_set_intfdata(intf, NULL);
 
-       input_unregister_device(iforce->dev);
+       input_unregister_device(iforce_usb->iforce.dev);
 
-       usb_free_urb(iforce->irq);
-       usb_free_urb(iforce->out);
-       usb_free_urb(iforce->ctrl);
+       usb_free_urb(iforce_usb->irq);
+       usb_free_urb(iforce_usb->out);
+       usb_free_urb(iforce_usb->ctrl);
 
-       kfree(iforce);
+       kfree(iforce_usb);
 }
 
 static const struct usb_device_id iforce_usb_ids[] = {

diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 3ee9245..d9712c4 100644 (file)
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -111,19 +111,7 @@ struct iforce {
        unsigned char data[IFORCE_MAX_LENGTH];
        unsigned char edata[IFORCE_MAX_LENGTH];
        u16 ecmd;
-       u16 expect_packet;
-
-#ifdef CONFIG_JOYSTICK_IFORCE_232
-       struct serio *serio;            /* RS232 transfer */
-       int idx, pkt, len, id;
-       unsigned char csum;
-#endif
-#ifdef CONFIG_JOYSTICK_IFORCE_USB
-       struct usb_device *usbdev;      /* USB transfer */
-       struct usb_interface *intf;
-       struct urb *irq, *out, *ctrl;
-       struct usb_ctrlrequest cr;
-#endif
+
        spinlock_t xmit_lock;
        /* Buffer used for asynchronous sending of bytes to the device */
        struct circ_buf xmit;