Commit 0e99a2b9 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove pci20xxx_private typedef

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 52b3e348
...@@ -148,12 +148,14 @@ typedef union { ...@@ -148,12 +148,14 @@ typedef union {
} pci20341; } pci20341;
} pci20xxx_subdev_private; } pci20xxx_subdev_private;
typedef struct { struct pci20xxx_private {
void *ioaddr; void *ioaddr;
pci20xxx_subdev_private subdev_private[PCI20000_MODULES]; pci20xxx_subdev_private subdev_private[PCI20000_MODULES];
} pci20xxx_private; };
#define devpriv ((pci20xxx_private *)dev->private) #define devpriv ((struct pci20xxx_private *)dev->private)
#define CHAN (CR_CHAN(it->chanlist[0])) #define CHAN (CR_CHAN(it->chanlist[0]))
static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * it);
...@@ -209,7 +211,7 @@ static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * ...@@ -209,7 +211,7 @@ static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig *
if ((ret = alloc_subdevices(dev, 1 + PCI20000_MODULES)) < 0) if ((ret = alloc_subdevices(dev, 1 + PCI20000_MODULES)) < 0)
return ret; return ret;
if ((ret = alloc_private(dev, sizeof(pci20xxx_private))) < 0) if ((ret = alloc_private(dev, sizeof(struct pci20xxx_private))) < 0)
return ret; return ret;
devpriv->ioaddr = (void *)(unsigned long)it->options[0]; devpriv->ioaddr = (void *)(unsigned long)it->options[0];
...@@ -255,7 +257,7 @@ static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * ...@@ -255,7 +257,7 @@ static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig *
} }
} }
/* initialize pci20xxx_private */ /* initialize struct pci20xxx_private */
pci20xxx_dio_init(dev, dev->subdevices + PCI20000_MODULES); pci20xxx_dio_init(dev, dev->subdevices + PCI20000_MODULES);
return 1; return 1;
...@@ -449,7 +451,7 @@ static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subd ...@@ -449,7 +451,7 @@ static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subd
static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data); struct comedi_insn * insn, unsigned int * data);
/* initialize pci20xxx_private */ /* initialize struct pci20xxx_private */
static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice * s) static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice * s)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment