Staging: comedi: Remove comedi_subdevice typedef

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci3xxx.c

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index 44ca298..ae11fb7 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -81,7 +81,7 @@ int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev)
 +----------------------------------------------------------------------------+
 | Function Name     : INT   i_APCI3XXX_AnalogInputConfigOperatingMode        |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -106,7 +106,7 @@ int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev)
 */
 
 int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_TimeBase = 0;
@@ -275,7 +275,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function Name     : INT   i_APCI3XXX_InsnConfigAnalogInput                 |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -296,7 +296,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
 
@@ -333,7 +333,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function Name     : INT   i_APCI3XXX_InsnReadAnalogInput                   |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -356,7 +356,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_Configuration = (BYTE) CR_RANGE(insn->chanspec);
@@ -664,7 +664,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d)
 +----------------------------------------------------------------------------+
 | Function Name     : INT   i_APCI3XXX_InsnWriteAnalogOutput                 |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -685,7 +685,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d)
 */
 
 int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        BYTE b_Range = (BYTE) CR_RANGE(insn->chanspec);
        BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec);
@@ -770,7 +770,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function Name     : INT   i_APCI3XXX_InsnConfigInitTTLIO                   |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -792,7 +792,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_Command = 0;
@@ -901,7 +901,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function Name     : INT     i_APCI3XXX_InsnBitsTTLIO                       |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -920,7 +920,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_ChannelCpt = 0;
@@ -1058,7 +1058,7 @@ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function Name     : INT i_APCI3XXX_InsnReadTTLIO                           |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -1075,7 +1075,7 @@ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec);
        INT i_ReturnValue = insn->n;
@@ -1170,7 +1170,7 @@ int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function Name     : INT     i_APCI3XXX_InsnWriteTTLIO                      |
 |                          (struct comedi_device    *dev,                           |
-|                           comedi_subdevice *s,                             |
+|                           struct comedi_subdevice *s,                             |
 |                           comedi_insn      *insn,                          |
 |                           unsigned int         *data)                          |
 +----------------------------------------------------------------------------+
@@ -1188,7 +1188,7 @@ int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec);
@@ -1282,7 +1282,7 @@ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function name     :int i_APCI3XXX_InsnReadDigitalInput                     |
 |                                          (struct comedi_device *dev,              |
-|                                           comedi_subdevice *s,             |
+|                                           struct comedi_subdevice *s,             |
 |                                           comedi_insn *insn,               |
 |                                           unsigned int *data)                  |
 +----------------------------------------------------------------------------+
@@ -1299,7 +1299,7 @@ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec);
@@ -1341,7 +1341,7 @@ int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function name     :int i_APCI3XXX_InsnBitsDigitalInput                     |
 |                                          (struct comedi_device *dev,              |
-|                                           comedi_subdevice *s,             |
+|                                           struct comedi_subdevice *s,             |
 |                                           comedi_insn *insn,               |
 |                                           unsigned int *data)                  |
 +----------------------------------------------------------------------------+
@@ -1357,7 +1357,7 @@ int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 */
 int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        DWORD dw_Temp = 0;
@@ -1392,7 +1392,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function name     :int i_APCI3XXX_InsnBitsDigitalOutput                    |
 |                                          (struct comedi_device *dev,              |
-|                                           comedi_subdevice *s,             |
+|                                           struct comedi_subdevice *s,             |
 |                                           comedi_insn *insn,               |
 |                                           unsigned int *data)                  |
 +----------------------------------------------------------------------------+
@@ -1410,7 +1410,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 */
 int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_ChannelCpt = 0;
@@ -1488,7 +1488,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function name     :int i_APCI3XXX_InsnWriteDigitalOutput                   |
 |                                          (struct comedi_device *dev,              |
-|                                           comedi_subdevice *s,             |
+|                                           struct comedi_subdevice *s,             |
 |                                           comedi_insn *insn,               |
 |                                           unsigned int *data)                  |
 +----------------------------------------------------------------------------+
@@ -1506,7 +1506,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_Channel = CR_CHAN(insn->chanspec);
@@ -1564,7 +1564,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev,
 +----------------------------------------------------------------------------+
 | Function name     :int i_APCI3XXX_InsnReadDigitalOutput                    |
 |                                          (struct comedi_device *dev,              |
-|                                           comedi_subdevice *s,             |
+|                                           struct comedi_subdevice *s,             |
 |                                           comedi_insn *insn,               |
 |                                           unsigned int *data)                  |
 +----------------------------------------------------------------------------+
@@ -1581,7 +1581,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev,
 */
 
 int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+       struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
 {
        INT i_ReturnValue = insn->n;
        BYTE b_Channel = CR_CHAN(insn->chanspec);