Skip to content

Commit

Permalink
Staging: comedi: Remove pcmmio_subdev_private 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 97baaed commit 4467df9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/comedi/drivers/pcmmio.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static const struct pcmmio_board pcmmio_boards[] = {
#define thisboard ((const struct pcmmio_board *)dev->board_ptr)

/* this structure is for data unique to this subdevice. */
typedef struct {
struct pcmmio_subdev_private {

union {
/* for DIO: mapping of halfwords (bytes) in port/chanarray to iobase */
Expand Down Expand Up @@ -233,7 +233,7 @@ typedef struct {
unsigned int shadow_samples[8]; /* the last unsigned int data written */
} ao;
};
} pcmmio_subdev_private;
};

/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
Expand All @@ -249,15 +249,15 @@ typedef struct {
unsigned int irq;
spinlock_t spinlock;
} asics[MAX_ASICS];
pcmmio_subdev_private *sprivs;
struct pcmmio_subdev_private *sprivs;
} pcmmio_private;

/*
* most drivers define the following macro to make it easy to
* access the private structure.
*/
#define devpriv ((pcmmio_private *)dev->private)
#define subpriv ((pcmmio_subdev_private *)s->private)
#define subpriv ((struct pcmmio_subdev_private *)s->private)
/*
* The struct comedi_driver structure tells the Comedi core module
* which functions to call to configure/deconfigure (attach/detach)
Expand Down Expand Up @@ -372,7 +372,7 @@ static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * i
n_dio_subdevs = CALC_N_DIO_SUBDEVS(chans_left);
n_subdevs = n_dio_subdevs + 2;
devpriv->sprivs =
kcalloc(n_subdevs, sizeof(pcmmio_subdev_private), GFP_KERNEL);
kcalloc(n_subdevs, sizeof(struct pcmmio_subdev_private), GFP_KERNEL);
if (!devpriv->sprivs) {
printk("cannot allocate subdevice private data structures\n");
return -ENOMEM;
Expand Down

0 comments on commit 4467df9

Please sign in to comment.