lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: cb_pcidda: remove private data variable 'digitalio'

Browse Source 
The private data variable 'digitalio' is only used to hold the PCI
base address for the 8255 devices on the board. This value is then
passed to subdev_8255_init() and stored in it's own private data.
There is no need to keep the value in the private data for the board.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-10-24 16:30:21 -07:00
committed by Greg Kroah-Hartman
parent dcf5e2b39a
commit 08f082ed78
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/cb_pcidda.c
View File

@@ -204,8 +204,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
}; };
struct cb_pcidda_private { struct cb_pcidda_private {
unsigned long digitalio;
/* bits last written to da calibration register 1 */ /* bits last written to da calibration register 1 */
unsigned int dac_cal1_bits; unsigned int dac_cal1_bits;
/* current range settings for output channels */ /* current range settings for output channels */
@@ -482,6 +480,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
const struct cb_pcidda_board *thisboard; const struct cb_pcidda_board *thisboard;
struct cb_pcidda_private *devpriv; struct cb_pcidda_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase_8255;
int index; int index;
int ret; int ret;
@@ -500,8 +499,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
dev->iobase = pci_resource_start(pcidev, 3); dev->iobase = pci_resource_start(pcidev, 3);
iobase_8255 = pci_resource_start(pcidev, 2);
devpriv->digitalio = pci_resource_start(pcidev, 2);
if (thisboard->status == 2) if (thisboard->status == 2)
printk printk
@@ -524,9 +522,9 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
/* two 8255 digital io subdevices */ /* two 8255 digital io subdevices */
s = &dev->subdevices[1]; s = &dev->subdevices[1];
subdev_8255_init(dev, s, NULL, devpriv->digitalio); subdev_8255_init(dev, s, NULL, iobase_8255);
s = &dev->subdevices[2]; s = &dev->subdevices[2];
subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A); subdev_8255_init(dev, s, NULL, iobase_8255 + PORT2A);
dev_dbg(dev->class_dev, "eeprom:\n"); dev_dbg(dev->class_dev, "eeprom:\n");
for (index = 0; index < EEPROM_SIZE; index++) { for (index = 0; index < EEPROM_SIZE; index++) {