Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141609
b: refs/heads/master
c: 0e99a2b
h: refs/heads/master
i:
  141607: fe4a44c
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 7633867 commit f93103e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 52b3e3483d12f03ad6c1fa051a5db0b5656596c9
refs/heads/master: 0e99a2b9a2367e47bebf8bdbb5aa0ce14d586968
14 changes: 8 additions & 6 deletions trunk/drivers/staging/comedi/drivers/ii_pci20kc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{

Expand Down

0 comments on commit f93103e

Please sign in to comment.