From f93103ed4df868b4331a9a58b936d31671771aee Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:18 -0400 Subject: [PATCH] --- yaml --- r: 141609 b: refs/heads/master c: 0e99a2b9a2367e47bebf8bdbb5aa0ce14d586968 h: refs/heads/master i: 141607: fe4a44c6baf618b43b5f127306cb1050e986020c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ii_pci20kc.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8d5bdc129e63..ff49fbb225bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52b3e3483d12f03ad6c1fa051a5db0b5656596c9 +refs/heads/master: 0e99a2b9a2367e47bebf8bdbb5aa0ce14d586968 diff --git a/trunk/drivers/staging/comedi/drivers/ii_pci20kc.c b/trunk/drivers/staging/comedi/drivers/ii_pci20kc.c index a31f0d20fcf2..624d44c3969f 100644 --- a/trunk/drivers/staging/comedi/drivers/ii_pci20kc.c +++ b/trunk/drivers/staging/comedi/drivers/ii_pci20kc.c @@ -148,12 +148,14 @@ typedef union { } pci20341; } pci20xxx_subdev_private; -typedef struct { +struct pci20xxx_private { + void *ioaddr; 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])) 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 * if ((ret = alloc_subdevices(dev, 1 + PCI20000_MODULES)) < 0) return ret; - if ((ret = alloc_private(dev, sizeof(pci20xxx_private))) < 0) + if ((ret = alloc_private(dev, sizeof(struct pci20xxx_private))) < 0) return ret; devpriv->ioaddr = (void *)(unsigned long)it->options[0]; @@ -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); return 1; @@ -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, 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) {