From 1f89417aa79b8ed31fca6b9cd4236000ee51a254 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 16 Aug 2012 19:51:27 -0700 Subject: [PATCH] --- yaml --- r: 324592 b: refs/heads/master c: 08c3c4077857a7c56b76d1b5b9d50ae3f8190424 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcimdda.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b68dc666e4ae..eb8de3581740 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9e33afb40e011d45fb9e47ecab305f5dc436028 +refs/heads/master: 08c3c4077857a7c56b76d1b5b9d50ae3f8190424 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c index 765f92cab8da..ecad85bd0d63 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -107,8 +107,6 @@ struct cb_pcimdda_board { unsigned short device_id; int ao_chans; int ao_bits; - /* how many bytes into the BADR are the DIO ports */ - int dio_offset; int regs_badrindex; /* IO Region for the control, analog output, and DIO registers */ int reg_sz; /* number of bytes of registers in io region */ @@ -120,7 +118,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = { .device_id = PCI_ID_PCIM_DDA06_16, .ao_chans = 6, .ao_bits = 16, - .dio_offset = 12, .regs_badrindex = 3, .reg_sz = 16, } @@ -279,7 +276,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev, s = dev->subdevices + 1; /* digital i/o subdevice */ ret = subdev_8255_init(dev, s, NULL, - dev->iobase + thisboard->dio_offset); + dev->iobase + PCIMDDA_8255_BASE_REG); if (ret) return ret; devpriv->attached_to_8255 = 1;