diff options
| author | H Hartley Sweeten | 2012-08-17 04:53:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-17 17:17:35 +0200 |
| commit | 8496fc47e311b2ceeccb224d215baae86172d092 (patch) | |
| tree | 8ff4b2009f0038e3bc8a2845b617f2df04155787 | |
| parent | staging: comedi: cb_pcimdda: remove boardinfo (diff) | |
| download | kernel-qcow2-linux-8496fc47e311b2ceeccb224d215baae86172d092.tar.gz kernel-qcow2-linux-8496fc47e311b2ceeccb224d215baae86172d092.tar.xz kernel-qcow2-linux-8496fc47e311b2ceeccb224d215baae86172d092.zip | |
staging: comedi: cb_pcimdda: remove attached_to_8255 from private data
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcimdda.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c index e9f0a6826cec..b10831d3cf22 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -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); |