staging: comedi: cb_pcimdda: remove attached_to_8255 from private data
PATCH 29/35 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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
--- drivers/staging/comedi/drivers/cb_pcimdda.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/staging/comedi/drivers/cb_pcimdda.c +2 -10
@@ -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);
Signature · 1 line
1.7.11