diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:13:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:06 -0700 |
| commit | b2e1b3c2bd6245c6d3d79f69fa94813b7db9a61e (patch) | |
| tree | b8827009511f924b36b387ec483566a12f8a56d9 | |
| parent | 0306b0cb8e13d51c16adf9bc3285de80f6dc93b3 (diff) | |
Staging: comedi: Remove jr3_t typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 75867c95b49..059fa2d32a9 100644 --- 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 d77f0ad62c5..d8a21dea3ca 100644 --- 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; +}; |