Staging: comedi: Remove jr3_t 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/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 75867c95b49d6d801f910490cd47d3199bde06a8..059fa2d32a998f1d7dc73c7c3aa8d97b43d6b0e5 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -130,7 +130,7 @@ MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);
 typedef struct {
        struct pci_dev *pci_dev;
        int pci_enabled;
-       volatile jr3_t *iobase;
+       volatile struct jr3_t *iobase;
        int n_channels;
        struct timer_list timer;
 } jr3_pci_dev_private;
@@ -845,7 +845,7 @@ static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig *
                return -EIO;
        }
        devpriv->pci_enabled = 1;
-       devpriv->iobase = ioremap(pci_resource_start(card, 0), sizeof(jr3_t));
+       devpriv->iobase = ioremap(pci_resource_start(card, 0), sizeof(struct jr3_t));
        result = alloc_subdevices(dev, devpriv->n_channels);
        if (result < 0)
                goto out;

diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h
index d77f0ad62c5153f1a2adade2364a60c74b64dfe6..d8a21dea3ca228b39130771c5e52fbc5a7815297 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.h
+++ b/drivers/staging/comedi/drivers/jr3_pci.h
@@ -669,7 +669,7 @@ typedef struct force_sensor_data {
        intern_transform_t transforms[0x10];    /* offset 0x0200 */
 } jr3_channel_t;
 
-typedef struct {
+struct jr3_t {
        struct {
                u32 program_low[0x4000];        /*  0x00000 - 0x10000 */
                jr3_channel_t data;     /*  0x10000 - 0x10c00 */
@@ -678,4 +678,4 @@ typedef struct {
                u32 reset;      /*  0x60000 - 0x60004 */
                char pad3[0x20000 - 0x00004];   /*  0x60004 - 0x80000 */
        } channel[4];
-} jr3_t;
+};