Staging: comedi: Remove comedi_devconfig typedef

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / comedi / drivers / rti800.c

diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 0cefcb39db7c32e752d0ca1419ad39b4289dfd36..bd579711a519c06c5fbe504397a8d7098ef3e74e 100644 (file)
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -96,21 +96,21 @@ Configuration options:
 
 #include "am9513.h"
 
-static const comedi_lrange range_rti800_ai_10_bipolar = { 4, {
+static const struct comedi_lrange range_rti800_ai_10_bipolar = { 4, {
                        BIP_RANGE(10),
                        BIP_RANGE(1),
                        BIP_RANGE(0.1),
                        BIP_RANGE(0.02)
        }
 };
-static const comedi_lrange range_rti800_ai_5_bipolar = { 4, {
+static const struct comedi_lrange range_rti800_ai_5_bipolar = { 4, {
                        BIP_RANGE(5),
                        BIP_RANGE(0.5),
                        BIP_RANGE(0.05),
                        BIP_RANGE(0.01)
        }
 };
-static const comedi_lrange range_rti800_ai_unipolar = { 4, {
+static const struct comedi_lrange range_rti800_ai_unipolar = { 4, {
                        UNI_RANGE(10),
                        UNI_RANGE(1),
                        UNI_RANGE(0.1),
@@ -129,9 +129,9 @@ static const boardtype boardtypes[] = {
 
 #define this_board ((const boardtype *)dev->board_ptr)
 
-static int rti800_attach(comedi_device * dev, comedi_devconfig * it);
-static int rti800_detach(comedi_device * dev);
-static comedi_driver driver_rti800 = {
+static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it);
+static int rti800_detach(struct comedi_device * dev);
+static struct comedi_driver driver_rti800 = {
       driver_name:"rti800",
       module:THIS_MODULE,
       attach:rti800_attach,
@@ -161,7 +161,7 @@ typedef struct {
        enum {
                dac_2comp, dac_straight
        } dac0_coding, dac1_coding;
-       const comedi_lrange *ao_range_type_list[2];
+       const struct comedi_lrange *ao_range_type_list[2];
        unsigned int ao_readback[2];
        int muxgain_bits;
 } rti800_private;
@@ -178,8 +178,8 @@ static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG)
 // settling delay times in usec for different gains
 static const int gaindelay[] = { 10, 20, 40, 80 };
 
-static int rti800_ai_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int rti800_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i, t;
        int status;
@@ -231,8 +231,8 @@ static int rti800_ai_insn_read(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int rti800_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int rti800_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan = CR_CHAN(insn->chanspec);
@@ -243,8 +243,8 @@ static int rti800_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int rti800_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int rti800_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan = CR_CHAN(insn->chanspec);
        int d;
@@ -263,8 +263,8 @@ static int rti800_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int rti800_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int rti800_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -272,8 +272,8 @@ static int rti800_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int rti800_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int rti800_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -307,12 +307,12 @@ static int rti800_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
    options[8] - dac1 coding
  */
 
-static int rti800_attach(comedi_device * dev, comedi_devconfig * it)
+static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it)
 {
        unsigned int irq;
        unsigned long iobase;
        int ret;
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
 
        iobase = it->options[0];
        printk("comedi%d: rti800: 0x%04lx ", dev->minor, iobase);
@@ -442,7 +442,7 @@ static int rti800_attach(comedi_device * dev, comedi_devconfig * it)
        return 0;
 }
 
-static int rti800_detach(comedi_device * dev)
+static int rti800_detach(struct comedi_device * dev)
 {
        printk("comedi%d: rti800: remove\n", dev->minor);