Staging: comedi: Remove comedi_insn typedef

[deliverable/linux.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci1500.h

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
index a0d924a8e6baf57c5b7e10a95a6d33ba05c0d352..5d960b40a6a8ef3924ac91272fa1bb31c7768329 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
@@ -116,50 +116,50 @@ enum {
 };
 
  /*----------DIGITAL INPUT----------------*/
-static int i_APCI1500_Initialisation(comedi_device *dev, comedi_subdevice *s,
-                                    comedi_insn *insn, lsampl_t *data);
-static int i_APCI1500_ConfigDigitalInputEvent(comedi_device *dev,
-                                             comedi_subdevice *s,
-                                             comedi_insn *insn,
-                                             lsampl_t *data);
+static int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice *s,
+                                    struct comedi_insn *insn, unsigned int *data);
+static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+                                             struct comedi_subdevice *s,
+                                             struct comedi_insn *insn,
+                                             unsigned int *data);
 
-static int i_APCI1500_StartStopInputEvent(comedi_device *dev,
-                                         comedi_subdevice *s,
-                                         comedi_insn *insn, lsampl_t *data);
-static int i_APCI1500_ReadMoreDigitalInput(comedi_device *dev,
-                                          comedi_subdevice *s,
-                                          comedi_insn *insn, lsampl_t *data);
+static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+                                         struct comedi_subdevice *s,
+                                         struct comedi_insn *insn, unsigned int *data);
+static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn, unsigned int *data);
 
 /*----------   DIGITAL OUTPUT------------*/
-static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device *dev,
-                                                       comedi_subdevice *s,
-                                                       comedi_insn *insn,
-                                                       lsampl_t *data);
-static int i_APCI1500_WriteDigitalOutput(comedi_device *dev,
-                                        comedi_subdevice *s,
-                                        comedi_insn *insn, lsampl_t *data);
+static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
+                                                       struct comedi_subdevice *s,
+                                                       struct comedi_insn *insn,
+                                                       unsigned int *data);
+static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn, unsigned int *data);
 
 /*----------TIMER----------------*/
-static int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device *dev,
-                                                comedi_subdevice *s,
-                                                comedi_insn *insn,
-                                                lsampl_t *data);
-static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device *dev,
-                                                          comedi_subdevice *s,
-                                                          comedi_insn *insn,
-                                                          lsampl_t *data);
-static int i_APCI1500_ReadCounterTimerWatchdog(comedi_device *dev,
-                                              comedi_subdevice *s,
-                                              comedi_insn *insn,
-                                              lsampl_t *data);
-static int i_APCI1500_ReadInterruptMask(comedi_device *dev,
-                                       comedi_subdevice *s,
-                                       comedi_insn *insn, lsampl_t *data);
+static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+                                                struct comedi_subdevice *s,
+                                                struct comedi_insn *insn,
+                                                unsigned int *data);
+static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
+                                                          struct comedi_subdevice *s,
+                                                          struct comedi_insn *insn,
+                                                          unsigned int *data);
+static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+                                              struct comedi_subdevice *s,
+                                              struct comedi_insn *insn,
+                                              unsigned int *data);
+static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
+                                       struct comedi_subdevice *s,
+                                       struct comedi_insn *insn, unsigned int *data);
 
 /*----------INTERRUPT HANDLER------*/
 static void v_APCI1500_Interrupt(int irq, void *d);
-static int i_APCI1500_ConfigureInterrupt(comedi_device *dev,
-                                        comedi_subdevice *s,
-                                        comedi_insn *insn, lsampl_t *data);
+static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn, unsigned int *data);
 /*----------RESET---------------*/
-static int i_APCI1500_Reset(comedi_device *dev);
+static int i_APCI1500_Reset(struct comedi_device *dev);