Staging: comedi: Remove str_TimerDetails typedef in addi-data/addi_eeprom.c

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / me4000.h

diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 37af3a8..733b192 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -293,42 +293,42 @@
   Information about the hardware capabilities
   ===========================================================================*/
 
-typedef struct me4000_ao_info {
+struct me4000_ao_info {
        int count;
        int fifo_count;
-} me4000_ao_info_t;
+};
 
-typedef struct me4000_ai_info {
+struct me4000_ai_info {
        int count;
        int sh_count;
        int diff_count;
        int ex_trig_analog;
-} me4000_ai_info_t;
+};
 
-typedef struct me4000_dio_info {
+struct me4000_dio_info {
        int count;
-} me4000_dio_info_t;
+};
 
-typedef struct me4000_cnt_info {
+struct me4000_cnt_info {
        int count;
-} me4000_cnt_info_t;
+};
 
-typedef struct me4000_board {
+struct me4000_board {
        const char *name;
        unsigned short device_id;
-       me4000_ao_info_t ao;
-       me4000_ai_info_t ai;
-       me4000_dio_info_t dio;
-       me4000_cnt_info_t cnt;
-} me4000_board_t;
+       struct me4000_ao_info ao;
+       struct me4000_ai_info ai;
+       struct me4000_dio_info dio;
+       struct me4000_cnt_info cnt;
+};
 
-#define thisboard ((const me4000_board_t *)dev->board_ptr)
+#define thisboard ((const struct me4000_board *)dev->board_ptr)
 
 /*=============================================================================
   Global board and subdevice information structures
   ===========================================================================*/
 
-typedef struct me4000_ao_context {
+struct me4000_ao_context {
        int irq;
 
        unsigned long mirror;   /*  Store the last written value */
@@ -340,9 +340,9 @@ typedef struct me4000_ao_context {
        unsigned long timer_reg;
        unsigned long irq_status_reg;
        unsigned long preload_reg;
-} me4000_ao_context_t;
+};
 
-typedef struct me4000_ai_context {
+struct me4000_ai_context {
        int irq;
 
        unsigned long ctrl_reg;
@@ -358,25 +358,25 @@ typedef struct me4000_ai_context {
        unsigned long start_reg;
        unsigned long irq_status_reg;
        unsigned long sample_counter_reg;
-} me4000_ai_context_t;
+};
 
-typedef struct me4000_dio_context {
+struct me4000_dio_context {
        unsigned long dir_reg;
        unsigned long ctrl_reg;
        unsigned long port_0_reg;
        unsigned long port_1_reg;
        unsigned long port_2_reg;
        unsigned long port_3_reg;
-} me4000_dio_context_t;
+};
 
-typedef struct me4000_cnt_context {
+struct me4000_cnt_context {
        unsigned long ctrl_reg;
        unsigned long counter_0_reg;
        unsigned long counter_1_reg;
        unsigned long counter_2_reg;
-} me4000_cnt_context_t;
+};
 
-typedef struct me4000_info {
+struct me4000_info {
        unsigned long plx_regbase;      /*  PLX configuration space base address */
        unsigned long me4000_regbase;   /*  Base address of the ME4000 */
        unsigned long timer_regbase;    /*  Base address of the timer circuit */
@@ -400,9 +400,9 @@ typedef struct me4000_info {
        struct me4000_ao_context ao_context[4]; /*  Vector with analog output specific context */
        struct me4000_dio_context dio_context;  /*  Digital I/O specific context */
        struct me4000_cnt_context cnt_context;  /*  Counter specific context */
-} me4000_info_t;
+};
 
-#define info   ((me4000_info_t *)dev->private)
+#define info   ((struct me4000_info *)dev->private)
 
 /*-----------------------------------------------------------------------------
   Defines for analog input