diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 8a2e109cde70b29b0f83b6fb89d02a2ead848674..12481a032b9f16db2f4891411a6e2006524059c8 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 6f167a7c9c82319dda547cf52fd97fd482fb85b5..733b19243c7563f89476211473fbca30f06e0633 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