Staging: comedi: Remove comedi_insn typedef

[pandora-kernel.git] / drivers / staging / comedi / drivers / jr3_pci.c

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 0a07748..19371c6 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -106,7 +106,7 @@ static int comedi_load_firmware(struct comedi_device * dev,
 static int jr3_pci_attach(struct comedi_device * dev, comedi_devconfig * it);
 static int jr3_pci_detach(struct comedi_device * dev);
 
-static comedi_driver driver_jr3_pci = {
+static struct comedi_driver driver_jr3_pci = {
       driver_name:"jr3_pci",
       module:THIS_MODULE,
       attach:jr3_pci_attach,
@@ -158,7 +158,7 @@ typedef struct {
                int length;
                comedi_krange range;
        } range[9];
-       const comedi_lrange *range_table_list[8 * 7 + 2];
+       const struct comedi_lrange *range_table_list[8 * 7 + 2];
        unsigned int maxdata_list[8 * 7 + 2];
        u16 errors;
        int retries;
@@ -269,8 +269,8 @@ static six_axis_t get_max_full_scales(volatile jr3_channel_t * channel)
        return result;
 }
 
-static int jr3_pci_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int jr3_pci_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int result;
        jr3_pci_subdev_private *p;
@@ -523,7 +523,7 @@ static int jr3_download_firmware(struct comedi_device * dev, const u8 * data,
        return result;
 }
 
-static poll_delay_t jr3_pci_poll_subdevice(comedi_subdevice * s)
+static poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s)
 {
        poll_delay_t result = poll_delay_min_max(1000, 2000);
        jr3_pci_subdev_private *p = s->private;
@@ -877,7 +877,7 @@ static int jr3_pci_attach(struct comedi_device * dev, comedi_devconfig * it)
                                p->range[j].range.max = 1000000;
                                for (k = 0; k < 7; k++) {
                                        p->range_table_list[j + k * 8] =
-                                               (comedi_lrange *) & p->range[j];
+                                               (struct comedi_lrange *) & p->range[j];
                                        p->maxdata_list[j + k * 8] = 0x7fff;
                                }
                        }
@@ -886,9 +886,9 @@ static int jr3_pci_attach(struct comedi_device * dev, comedi_devconfig * it)
                        p->range[8].range.max = 65536;
 
                        p->range_table_list[56] =
-                               (comedi_lrange *) & p->range[8];
+                               (struct comedi_lrange *) & p->range[8];
                        p->range_table_list[57] =
-                               (comedi_lrange *) & p->range[8];
+                               (struct comedi_lrange *) & p->range[8];
                        p->maxdata_list[56] = 0xffff;
                        p->maxdata_list[57] = 0xffff;
                        // Channel specific range and maxdata