Commit b4ce4f16 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove str_ModuleInfo typedef in addi-data

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6a770eca
...@@ -201,9 +201,9 @@ struct addi_board { ...@@ -201,9 +201,9 @@ struct addi_board {
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
}; };
//MODULE INFO STRUCTURE /* MODULE INFO STRUCTURE */
typedef union { union str_ModuleInfo {
/* Incremental counter infos */ /* Incremental counter infos */
struct { struct {
union { union {
...@@ -342,7 +342,7 @@ typedef union { ...@@ -342,7 +342,7 @@ typedef union {
unsigned char b_CDAReadFIFOOverflow; unsigned char b_CDAReadFIFOOverflow;
} s_CDAModuleInfo; } s_CDAModuleInfo;
} str_ModuleInfo; };
/* Private structure for the addi_apci3120 driver */ /* Private structure for the addi_apci3120 driver */
typedef struct { typedef struct {
...@@ -431,7 +431,7 @@ typedef struct { ...@@ -431,7 +431,7 @@ typedef struct {
} s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT]; } s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT];
} s_InterruptParameters; } s_InterruptParameters;
str_ModuleInfo s_ModuleInfo[4]; union str_ModuleInfo s_ModuleInfo[4];
unsigned int ul_TTLPortConfiguration[10]; unsigned int ul_TTLPortConfiguration[10];
} addi_private; } addi_private;
......
...@@ -261,7 +261,7 @@ void v_APCI1710_Interrupt(int irq, void *d) ...@@ -261,7 +261,7 @@ void v_APCI1710_Interrupt(int irq, void *d)
unsigned int ul_82X54InterruptStatus; unsigned int ul_82X54InterruptStatus;
unsigned int ul_StatusRegister; unsigned int ul_StatusRegister;
str_ModuleInfo *ps_ModuleInfo; union str_ModuleInfo *ps_ModuleInfo;
printk("APCI1710 Interrupt\n"); printk("APCI1710 Interrupt\n");
for (b_ModuleCpt = 0; b_ModuleCpt < 4; b_ModuleCpt++, ps_ModuleInfo++) { for (b_ModuleCpt = 0; b_ModuleCpt < 4; b_ModuleCpt++, ps_ModuleInfo++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment