Staging: comedi: Remove labpc_private typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index d7641cd920bee9863264a1aca94eeea44f20de80..c0da5c75b4bb9a08e7bcd9eaf1790258bc94927e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -427,7 +427,7 @@ static const struct labpc_board_struct labpc_boards[] = {
 static const int dma_buffer_size = 0xff00;     // size in bytes of dma buffer
 static const int sample_size = 2;      // 2 bytes per sample
 
-#define devpriv ((labpc_private *)dev->private)
+#define devpriv ((struct labpc_private *)dev->private)
 
 static struct comedi_driver driver_labpc = {
        .driver_name = DRV_NAME,
@@ -653,7 +653,7 @@ static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it
 #endif
 
        /* allocate and initialize dev->private */
-       if (alloc_private(dev, sizeof(labpc_private)) < 0)
+       if (alloc_private(dev, sizeof(struct labpc_private)) < 0)
                return -ENOMEM;
 
        // get base address, irq etc. based on bustype

diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h
index cf53a94a51a22303d5fd58638571e07708182064..6f76db026b9bbe7aa0320d408c48f9e04be741df 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/drivers/staging/comedi/drivers/ni_labpc.h
@@ -46,7 +46,7 @@ struct labpc_board_struct {
        unsigned memory_mapped_io:1;    /* uses memory mapped io instead of ioports */
 };
 
-typedef struct {
+struct labpc_private {
        struct mite_struct *mite;       // for mite chip on pci-1200
        volatile unsigned long long count;      /* number of data points left to be taken */
        unsigned int ao_value[NUM_AO_CHAN];     // software copy of analog output values
@@ -72,7 +72,7 @@ typedef struct {
        // function pointers so we can use inb/outb or readb/writeb as appropriate
        unsigned int (*read_byte) (unsigned long address);
        void (*write_byte) (unsigned int byte, unsigned long address);
-} labpc_private;
+};
 
 int labpc_common_attach(struct comedi_device * dev, unsigned long iobase,
        unsigned int irq, unsigned int dma);

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 1e58d2e40ab839787cfad80152aa1dc7a7f8ab98..884074ddaac83bfc5ed756eb3bb316d184119cc3 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -133,7 +133,7 @@ static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it
        struct pcmcia_device *link;
 
        /* allocate and initialize dev->private */
-       if (alloc_private(dev, sizeof(labpc_private)) < 0)
+       if (alloc_private(dev, sizeof(struct labpc_private)) < 0)
                return -ENOMEM;
 
        // get base address, irq etc. based on bustype