Skip to content

Commit

Permalink
Staging: comedi: Remove jr3_t typedef
Browse files Browse the repository at this point in the history
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 0306b0c commit b2e1b3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/jr3_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/jr3_pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -678,4 +678,4 @@ typedef struct {
u32 reset; /* 0x60000 - 0x60004 */
char pad3[0x20000 - 0x00004]; /* 0x60004 - 0x80000 */
} channel[4];
} jr3_t;
};

0 comments on commit b2e1b3c

Please sign in to comment.