Staging: comedi: Remove ni_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_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 72985e084f0978d6e45cc484703a65ccd1513e88..76def4b9e8fbee56870881d7b2449e4b2191b651 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -276,10 +276,12 @@ static const int ni_irqpin[] =
 
 #define NI_E_IRQ_FLAGS         0
 
-typedef struct {
+struct ni_private {
        struct pnp_dev *isapnp_dev;
- NI_PRIVATE_COMMON} ni_private;
-#define devpriv ((ni_private *)dev->private)
+         NI_PRIVATE_COMMON
+};
+
+#define devpriv ((struct ni_private *)dev->private)
 
 /* How we access registers */
 

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 542bd0dcd44db698956cb3ab9ba2fd31fb5b1e0d..e46545048c3acc480a92ed4d779454fbfad28a49 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -4278,7 +4278,7 @@ static int ni_alloc_private(struct comedi_device * dev)
 {
        int ret;
 
-       ret = alloc_private(dev, sizeof(ni_private));
+       ret = alloc_private(dev, sizeof(struct ni_private));
        if (ret < 0)
                return ret;
 

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 225f39785f0b6c615b924e4684b4ecdc54fe8e8e..90e228b0ae0f686e91fef8829e8a06c4a881412e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1218,9 +1218,11 @@ static struct comedi_driver driver_pcimio = {
 
 COMEDI_PCI_INITCLEANUP(driver_pcimio, ni_pci_table)
 
-typedef struct {
-NI_PRIVATE_COMMON} ni_private;
-#define devpriv ((ni_private *)dev->private)
+struct ni_private {
+NI_PRIVATE_COMMON
+};
+
+#define devpriv ((struct ni_private *)dev->private)
 
 /* How we access registers */