Staging: comedi: Remove comedi_insn typedef

[deliverable/linux.git] / drivers / staging / comedi / drivers / pcl812.c

diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index b678dd6dd73f40f26ba754f091d352f4f52327ba..7b0a95c0e98395fb51c57ad3ab922b23d1a5a66e 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -159,7 +159,7 @@ Options for ACL-8113, ISO-813:
 
 #define MAX_CHANLIST_LEN       256     /* length of scan list */
 
-static const comedi_lrange range_pcl812pg_ai = { 5, {
+static const struct comedi_lrange range_pcl812pg_ai = { 5, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
@@ -167,7 +167,7 @@ static const comedi_lrange range_pcl812pg_ai = { 5, {
                        BIP_RANGE(0.3125),
        }
 };
-static const comedi_lrange range_pcl812pg2_ai = { 5, {
+static const struct comedi_lrange range_pcl812pg2_ai = { 5, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
@@ -175,33 +175,33 @@ static const comedi_lrange range_pcl812pg2_ai = { 5, {
                        BIP_RANGE(0.625),
        }
 };
-static const comedi_lrange range812_bipolar1_25 = { 1, {
+static const struct comedi_lrange range812_bipolar1_25 = { 1, {
                        BIP_RANGE(1.25),
        }
 };
-static const comedi_lrange range812_bipolar0_625 = { 1, {
+static const struct comedi_lrange range812_bipolar0_625 = { 1, {
                        BIP_RANGE(0.625),
        }
 };
-static const comedi_lrange range812_bipolar0_3125 = { 1, {
+static const struct comedi_lrange range812_bipolar0_3125 = { 1, {
                        BIP_RANGE(0.3125),
        }
 };
-static const comedi_lrange range_pcl813b_ai = { 4, {
+static const struct comedi_lrange range_pcl813b_ai = { 4, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
                        BIP_RANGE(0.625),
        }
 };
-static const comedi_lrange range_pcl813b2_ai = { 4, {
+static const struct comedi_lrange range_pcl813b2_ai = { 4, {
                        UNI_RANGE(10),
                        UNI_RANGE(5),
                        UNI_RANGE(2.5),
                        UNI_RANGE(1.25),
        }
 };
-static const comedi_lrange range_iso813_1_ai = { 5, {
+static const struct comedi_lrange range_iso813_1_ai = { 5, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
@@ -209,7 +209,7 @@ static const comedi_lrange range_iso813_1_ai = { 5, {
                        BIP_RANGE(0.3125),
        }
 };
-static const comedi_lrange range_iso813_1_2_ai = { 5, {
+static const struct comedi_lrange range_iso813_1_2_ai = { 5, {
                        UNI_RANGE(10),
                        UNI_RANGE(5),
                        UNI_RANGE(2.5),
@@ -217,47 +217,47 @@ static const comedi_lrange range_iso813_1_2_ai = { 5, {
                        UNI_RANGE(0.625),
        }
 };
-static const comedi_lrange range_iso813_2_ai = { 4, {
+static const struct comedi_lrange range_iso813_2_ai = { 4, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
                        BIP_RANGE(0.625),
        }
 };
-static const comedi_lrange range_iso813_2_2_ai = { 4, {
+static const struct comedi_lrange range_iso813_2_2_ai = { 4, {
                        UNI_RANGE(10),
                        UNI_RANGE(5),
                        UNI_RANGE(2.5),
                        UNI_RANGE(1.25),
        }
 };
-static const comedi_lrange range_acl8113_1_ai = { 4, {
+static const struct comedi_lrange range_acl8113_1_ai = { 4, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
                        BIP_RANGE(0.625),
        }
 };
-static const comedi_lrange range_acl8113_1_2_ai = { 4, {
+static const struct comedi_lrange range_acl8113_1_2_ai = { 4, {
                        UNI_RANGE(10),
                        UNI_RANGE(5),
                        UNI_RANGE(2.5),
                        UNI_RANGE(1.25),
        }
 };
-static const comedi_lrange range_acl8113_2_ai = { 3, {
+static const struct comedi_lrange range_acl8113_2_ai = { 3, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
        }
 };
-static const comedi_lrange range_acl8113_2_2_ai = { 3, {
+static const struct comedi_lrange range_acl8113_2_2_ai = { 3, {
                        UNI_RANGE(10),
                        UNI_RANGE(5),
                        UNI_RANGE(2.5),
        }
 };
-static const comedi_lrange range_acl8112dg_ai = { 9, {
+static const struct comedi_lrange range_acl8112dg_ai = { 9, {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
                        BIP_RANGE(1.25),
@@ -269,7 +269,7 @@ static const comedi_lrange range_acl8112dg_ai = { 9, {
                        BIP_RANGE(10),
        }
 };
-static const comedi_lrange range_acl8112hg_ai = { 12, {
+static const struct comedi_lrange range_acl8112hg_ai = { 12, {
                        BIP_RANGE(5),
                        BIP_RANGE(0.5),
                        BIP_RANGE(0.05),
@@ -284,7 +284,7 @@ static const comedi_lrange range_acl8112hg_ai = { 12, {
                        BIP_RANGE(0.01),
        }
 };
-static const comedi_lrange range_a821pgh_ai = { 4, {
+static const struct comedi_lrange range_a821pgh_ai = { 4, {
                        BIP_RANGE(5),
                        BIP_RANGE(0.5),
                        BIP_RANGE(0.05),
@@ -306,8 +306,8 @@ typedef struct {
        int ai_maxdata;         // AI resolution
        unsigned int ai_ns_min; // max sample speed of card v ns
        unsigned int i8254_osc_base;    // clock base
-       const comedi_lrange *rangelist_ai;      // rangelist for A/D
-       const comedi_lrange *rangelist_ao;      // rangelist for D/A
+       const struct comedi_lrange *rangelist_ai;       // rangelist for A/D
+       const struct comedi_lrange *rangelist_ao;       // rangelist for D/A
        unsigned int IRQbits;   // allowed IRQ
        unsigned char DMAbits;  // allowed DMA chans
        unsigned char io_range; // iorange for this board
@@ -374,7 +374,7 @@ static const boardtype boardtypes[] = {
 #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
 #define this_board ((const boardtype *)dev->board_ptr)
 
-static comedi_driver driver_pcl812 = {
+static struct comedi_driver driver_pcl812 = {
       driver_name:"pcl812",
       module:THIS_MODULE,
       attach:pcl812_attach,
@@ -434,7 +434,7 @@ static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice
 ==============================================================================
 */
 static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int n;
        int timeout, hi;
@@ -468,7 +468,7 @@ static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi
 ==============================================================================
 */
 static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int n;
        int timeout;
@@ -504,7 +504,7 @@ static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdev
 ==============================================================================
 */
 static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan = CR_CHAN(insn->chanspec);
        int i;
@@ -524,7 +524,7 @@ static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdev
 ==============================================================================
 */
 static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan = CR_CHAN(insn->chanspec);
        int i;
@@ -540,7 +540,7 @@ static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi
 ==============================================================================
 */
 static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -555,7 +555,7 @@ static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi
 ==============================================================================
 */
 static int pcl812_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -575,7 +575,7 @@ static int pcl812_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi
 /*
 ==============================================================================
 */
-static void pcl812_cmdtest_out(int e, comedi_cmd * cmd)
+static void pcl812_cmdtest_out(int e, struct comedi_cmd * cmd)
 {
        rt_printk("pcl812 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e,
                cmd->start_src, cmd->scan_begin_src, cmd->convert_src);
@@ -592,7 +592,7 @@ static void pcl812_cmdtest_out(int e, comedi_cmd * cmd)
 ==============================================================================
 */
 static int pcl812_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd)
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        int tmp, divisor1, divisor2;
@@ -773,7 +773,7 @@ static int pcl812_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice
 static int pcl812_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes;
-       comedi_cmd *cmd = &s->async->cmd;
+       struct comedi_cmd *cmd = &s->async->cmd;
 
 #ifdef PCL812_EXTDEBUG
        rt_printk("pcl812 EDBG: BGN: pcl812_ai_cmd(...)\n");