mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: cb_pcimdda: remove attached_to_8255 from private data

Browse Source 
The attached_to_8255 variable in the private data is used as a flag
to indicate that the 8255 subdevice has been initialized. The call
to subdev_8255_cleanup only requires that the dev->subdevices pointer
is valid. Change the test in the detach function and remove the
attached_to_8255 variable.

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-08-16 19:53:20 -07:00
committed by Greg Kroah-Hartman
parent 86476d9f7c
commit 8496fc47e3
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/cb_pcimdda.c
View File

@@ -105,8 +105,6 @@ Configuration Options:
* struct.
*/
struct cb_pcimdda_private {
char attached_to_8255; /* boolean */
#define MAX_AO_READBACK_CHANNELS 6
/* Used for AO readback */
unsigned int ao_readback[MAX_AO_READBACK_CHANNELS];
@@ -248,7 +246,6 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
dev->iobase + PCIMDDA_8255_BASE_REG);
if (ret)
return ret;
devpriv->attached_to_8255 = 1;
dev_info(dev->class_dev, "%s attached\n", dev->board_name);
@@ -258,14 +255,9 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
static void cb_pcimdda_detach(struct comedi_device *dev)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct cb_pcimdda_private *devpriv = dev->private;
if (devpriv) {
if (dev->subdevices && devpriv->attached_to_8255) {
subdev_8255_cleanup(dev, dev->subdevices + 2);
devpriv->attached_to_8255 = 0;
}
}
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2);
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);