From: H Hartley Sweeten Date: Fri, 17 Aug 2012 02:51:27 +0000 (-0700) Subject: staging: comedi: cb_pcimdda: remove dio_offset from the boardinfo X-Git-Tag: v3.7-rc1~173^2~875 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08c3c4077857a7c56b76d1b5b9d50ae3f8190424;p=profile%2Fivi%2Fkernel-x86-ivi.git staging: comedi: cb_pcimdda: remove dio_offset from the boardinfo The 8255 device is located at a fixed offset from the base address of the card. There is not need to carry this offset in the boardinfo. Remove it. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c index 765f92c..ecad85b 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/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;