aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-19 18:00:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:18 -0700
commit63aa142aca0e4b63347e91b8c6909fbad7e7c7ac (patch)
treed0ff4b8c57020d6c6837f8a931f6ca98f766dd4e /drivers
parent126974dc8c432535f9eef36956056b88a153bfb3 (diff)
Staging: comedi: Remove me4000_info_t typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/me4000.c2
-rw-r--r--drivers/staging/comedi/drivers/me4000.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 8a2e109cde7..12481a032b9 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -378,7 +378,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
CALL_PDEBUG("In me4000_probe()\n");
/* Allocate private memory */
- if (alloc_private(dev, sizeof(me4000_info_t)) < 0)
+ if (alloc_private(dev, sizeof(struct me4000_info)) < 0)
return -ENOMEM;
/*
diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 6f167a7c9c8..733b19243c7 100644
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -376,7 +376,7 @@ struct me4000_cnt_context {
unsigned long counter_2_reg;
};
-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