Staging: comedi: Remove comedi_insn typedef

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

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 5048255b4a3f580e140c2d951d16ac0a3d7a77f0..5227e3ee273b735974e13b40061955298a4a73f9 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -55,10 +55,10 @@ support could be added to this driver.
 static int hpdi_attach(struct comedi_device * dev, comedi_devconfig * it);
 static int hpdi_detach(struct comedi_device * dev);
 void abort_dma(struct comedi_device * dev, unsigned int channel);
-static int hpdi_cmd(struct comedi_device * dev, comedi_subdevice * s);
-static int hpdi_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_cmd * cmd);
-static int hpdi_cancel(struct comedi_device * dev, comedi_subdevice * s);
+static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s);
+static int hpdi_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd);
+static int hpdi_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
 static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG);
 static int dio_config_block_size(struct comedi_device * dev, unsigned int * data);
 
@@ -327,7 +327,7 @@ static inline hpdi_private *priv(struct comedi_device * dev)
        return dev->private;
 }
 
-static comedi_driver driver_hpdi = {
+static struct comedi_driver driver_hpdi = {
       driver_name:"gsc_hpdi",
       module:THIS_MODULE,
       attach:hpdi_attach,
@@ -336,8 +336,8 @@ static comedi_driver driver_hpdi = {
 
 COMEDI_PCI_INITCLEANUP(driver_hpdi, hpdi_pci_table);
 
-static int dio_config_insn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int dio_config_insn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        switch (data[0]) {
        case INSN_CONFIG_DIO_OUTPUT:
@@ -437,7 +437,7 @@ static void init_plx9080(struct comedi_device * dev)
  */
 static int setup_subdevices(struct comedi_device * dev)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
 
        if (alloc_subdevices(dev, 1) < 0)
                return -ENOMEM;
@@ -718,8 +718,8 @@ static int dio_config_block_size(struct comedi_device * dev, unsigned int * data
        return 2;
 }
 
-static int di_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_cmd * cmd)
+static int di_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        int tmp;
@@ -818,8 +818,8 @@ static int di_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
        return 0;
 }
 
-static int hpdi_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_cmd * cmd)
+static int hpdi_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd)
 {
        if (priv(dev)->dio_config_output) {
                return -EINVAL;
@@ -834,12 +834,12 @@ static inline void hpdi_writel(struct comedi_device * dev, uint32_t bits,
                priv(dev)->hpdi_iobase + offset);
 }
 
-static int di_cmd(struct comedi_device * dev, comedi_subdevice * s)
+static int di_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        uint32_t bits;
        unsigned long flags;
-       comedi_async *async = s->async;
-       comedi_cmd *cmd = &async->cmd;
+       struct comedi_async *async = s->async;
+       struct comedi_cmd *cmd = &async->cmd;
 
        hpdi_writel(dev, RX_FIFO_RESET_BIT, BOARD_CONTROL_REG);
 
@@ -887,7 +887,7 @@ static int di_cmd(struct comedi_device * dev, comedi_subdevice * s)
        return 0;
 }
 
-static int hpdi_cmd(struct comedi_device * dev, comedi_subdevice * s)
+static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        if (priv(dev)->dio_config_output) {
                return -EINVAL;
@@ -897,7 +897,7 @@ static int hpdi_cmd(struct comedi_device * dev, comedi_subdevice * s)
 
 static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel)
 {
-       comedi_async *async = dev->read_subdev->async;
+       struct comedi_async *async = dev->read_subdev->async;
        uint32_t next_transfer_addr;
        int j;
        int num_samples = 0;
@@ -944,8 +944,8 @@ static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel)
 static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG)
 {
        struct comedi_device *dev = d;
-       comedi_subdevice *s = dev->read_subdev;
-       comedi_async *async = s->async;
+       struct comedi_subdevice *s = dev->read_subdev;
+       struct comedi_async *async = s->async;
        uint32_t hpdi_intr_status, hpdi_board_status;
        uint32_t plx_status;
        uint32_t plx_bits;
@@ -1044,7 +1044,7 @@ void abort_dma(struct comedi_device * dev, unsigned int channel)
        comedi_spin_unlock_irqrestore(&dev->spinlock, flags);
 }
 
-static int hpdi_cancel(struct comedi_device * dev, comedi_subdevice * s)
+static int hpdi_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        hpdi_writel(dev, 0, BOARD_CONTROL_REG);