Staging: comedi: Remove comedi_subdevice typedef

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

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 5266cae..add9b11 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -265,14 +265,14 @@ typedef struct {
        resource_size_t phys_addr;
        void *io_addr;
        unsigned int lock;
-       lsampl_t ao_readback[2];
+       unsigned int ao_readback[2];
        unsigned int ai_front;
        unsigned int ai_rear;
 } dt3k_private;
 #define devpriv ((dt3k_private *)dev->private)
 
-static int dt3000_attach(comedi_device * dev, comedi_devconfig * it);
-static int dt3000_detach(comedi_device * dev);
+static int dt3000_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int dt3000_detach(struct comedi_device * dev);
 static comedi_driver driver_dt3000 = {
       driver_name:"dt3000",
       module:THIS_MODULE,
@@ -282,17 +282,17 @@ static comedi_driver driver_dt3000 = {
 
 COMEDI_PCI_INITCLEANUP(driver_dt3000, dt3k_pci_table);
 
-static void dt3k_ai_empty_fifo(comedi_device * dev, comedi_subdevice * s);
+static void dt3k_ai_empty_fifo(struct comedi_device * dev, struct comedi_subdevice * s);
 static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *arg,
        unsigned int round_mode);
-static int dt3k_ai_cancel(comedi_device * dev, comedi_subdevice * s);
+static int dt3k_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
 #ifdef DEBUG
 static void debug_intr_flags(unsigned int flags);
 #endif
 
 #define TIMEOUT 100
 
-static int dt3k_send_cmd(comedi_device * dev, unsigned int cmd)
+static int dt3k_send_cmd(struct comedi_device * dev, unsigned int cmd)
 {
        int i;
        unsigned int status = 0;
@@ -314,7 +314,7 @@ static int dt3k_send_cmd(comedi_device * dev, unsigned int cmd)
        return -ETIME;
 }
 
-static unsigned int dt3k_readsingle(comedi_device * dev, unsigned int subsys,
+static unsigned int dt3k_readsingle(struct comedi_device * dev, unsigned int subsys,
        unsigned int chan, unsigned int gain)
 {
        writew(subsys, devpriv->io_addr + DPR_SubSys);
@@ -327,7 +327,7 @@ static unsigned int dt3k_readsingle(comedi_device * dev, unsigned int subsys,
        return readw(devpriv->io_addr + DPR_Params(2));
 }
 
-static void dt3k_writesingle(comedi_device * dev, unsigned int subsys,
+static void dt3k_writesingle(struct comedi_device * dev, unsigned int subsys,
        unsigned int chan, unsigned int data)
 {
        writew(subsys, devpriv->io_addr + DPR_SubSys);
@@ -345,8 +345,8 @@ static int debug_n_ints = 0;
 // What's this debug_n_ints stuff? Obviously needs some work...
 static irqreturn_t dt3k_interrupt(int irq, void *d PT_REGS_ARG)
 {
-       comedi_device *dev = d;
-       comedi_subdevice *s;
+       struct comedi_device *dev = d;
+       struct comedi_subdevice *s;
        unsigned int status;
 
        if (!dev->attached) {
@@ -396,13 +396,13 @@ static void debug_intr_flags(unsigned int flags)
 }
 #endif
 
-static void dt3k_ai_empty_fifo(comedi_device * dev, comedi_subdevice * s)
+static void dt3k_ai_empty_fifo(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        int front;
        int rear;
        int count;
        int i;
-       sampl_t data;
+       short data;
 
        front = readw(devpriv->io_addr + DPR_AD_Buf_Front);
        count = front - devpriv->ai_front;
@@ -425,7 +425,7 @@ static void dt3k_ai_empty_fifo(comedi_device * dev, comedi_subdevice * s)
        writew(rear, devpriv->io_addr + DPR_AD_Buf_Rear);
 }
 
-static int dt3k_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
+static int dt3k_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
        comedi_cmd * cmd)
 {
        int err = 0;
@@ -587,7 +587,7 @@ static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *nanosec,
        return (prescale << 16) | (divider);
 }
 
-static int dt3k_ai_cmd(comedi_device * dev, comedi_subdevice * s)
+static int dt3k_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        comedi_cmd *cmd = &s->async->cmd;
        int i;
@@ -655,7 +655,7 @@ static int dt3k_ai_cmd(comedi_device * dev, comedi_subdevice * s)
        return 0;
 }
 
-static int dt3k_ai_cancel(comedi_device * dev, comedi_subdevice * s)
+static int dt3k_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        int ret;
 
@@ -667,8 +667,8 @@ static int dt3k_ai_cancel(comedi_device * dev, comedi_subdevice * s)
        return 0;
 }
 
-static int dt3k_ai_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt3k_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       comedi_insn * insn, unsigned int * data)
 {
        int i;
        unsigned int chan, gain, aref;
@@ -685,8 +685,8 @@ static int dt3k_ai_insn(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int dt3k_ao_insn(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt3k_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       comedi_insn * insn, unsigned int * data)
 {
        int i;
        unsigned int chan;
@@ -700,8 +700,8 @@ static int dt3k_ao_insn(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int dt3k_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt3k_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       comedi_insn * insn, unsigned int * data)
 {
        int i;
        unsigned int chan;
@@ -714,7 +714,7 @@ static int dt3k_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static void dt3k_dio_config(comedi_device * dev, int bits)
+static void dt3k_dio_config(struct comedi_device * dev, int bits)
 {
        /* XXX */
        writew(SUBS_DOUT, devpriv->io_addr + DPR_SubSys);
@@ -729,8 +729,8 @@ static void dt3k_dio_config(comedi_device * dev, int bits)
        dt3k_send_cmd(dev, CMD_CONFIG);
 }
 
-static int dt3k_dio_insn_config(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt3k_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
+       comedi_insn * insn, unsigned int * data)
 {
        int mask;
 
@@ -760,8 +760,8 @@ static int dt3k_dio_insn_config(comedi_device * dev, comedi_subdevice * s,
        return insn->n;
 }
 
-static int dt3k_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt3k_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
+       comedi_insn * insn, unsigned int * data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -776,8 +776,8 @@ static int dt3k_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int dt3k_mem_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int dt3k_mem_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       comedi_insn * insn, unsigned int * data)
 {
        unsigned int addr = CR_CHAN(insn->chanspec);
        int i;
@@ -795,11 +795,11 @@ static int dt3k_mem_insn_read(comedi_device * dev, comedi_subdevice * s,
        return i;
 }
 
-static int dt_pci_probe(comedi_device * dev, int bus, int slot);
+static int dt_pci_probe(struct comedi_device * dev, int bus, int slot);
 
-static int dt3000_attach(comedi_device * dev, comedi_devconfig * it)
+static int dt3000_attach(struct comedi_device * dev, comedi_devconfig * it)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        int bus, slot;
        int ret = 0;
 
@@ -886,7 +886,7 @@ static int dt3000_attach(comedi_device * dev, comedi_devconfig * it)
        return 0;
 }
 
-static int dt3000_detach(comedi_device * dev)
+static int dt3000_detach(struct comedi_device * dev)
 {
        if (dev->irq)
                comedi_free_irq(dev->irq, dev);
@@ -907,9 +907,9 @@ static int dt3000_detach(comedi_device * dev)
 }
 
 static struct pci_dev *dt_pci_find_device(struct pci_dev *from, int *board);
-static int setup_pci(comedi_device * dev);
+static int setup_pci(struct comedi_device * dev);
 
-static int dt_pci_probe(comedi_device * dev, int bus, int slot)
+static int dt_pci_probe(struct comedi_device * dev, int bus, int slot)
 {
        int board;
        int ret;
@@ -937,7 +937,7 @@ static int dt_pci_probe(comedi_device * dev, int bus, int slot)
        return 1;
 }
 
-static int setup_pci(comedi_device * dev)
+static int setup_pci(struct comedi_device * dev)
 {
        resource_size_t addr;
        int ret;