staging: comedi: adl_pci6208: use comedi_device pci_dev pointer
PATCH 2/30 staging: comedi: adl_pci6208: use comedi_device pci_dev pointer
Use the pci_dev pointer in the comedi_device struct instead of carrying it in the private data.
Signed-off-by H Hartley Sweeten <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
--- drivers/staging/comedi/drivers/adl_pci6208.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/staging/comedi/drivers/adl_pci6208.c +7 -10
@@ -73,7 +73,6 @@ static const struct pci6208_board pci6208_boards[] = { };struct pci6208_private { -struct pci_dev *pci_dev;unsigned int ao_readback[PCI6208_MAX_AO_CHANNELS ]; };
@@ -208,20 +207,20 @@ static int pci6208_attach(struct comedi_device *dev,return ret; devpriv = dev->private; - devpriv->pci_dev =pci6208_find_device (dev, it); -if (!devpriv->pci_dev) + dev->pcidev =pci6208_find_device (dev, it); +if (!dev->pcidev)return -EIO ; thisboard =comedi_board (dev); dev->board_name = thisboard->name; - ret =comedi_pci_enable (devpriv->pci_dev, dev->driver->driver_name); + ret =comedi_pci_enable (dev->pcidev, dev->driver->driver_name);if (ret) {dev_err (dev->class_dev,"Failed to enable PCI device and request regions\n" );return ret; } - dev->iobase =pci_resource_start (devpriv->pci_dev,2 ); + dev->iobase =pci_resource_start (dev->pcidev,2 ); ret =comedi_alloc_subdevices (dev,2 );if (ret)
@@ -258,12 +257,10 @@ static int pci6208_attach(struct comedi_device *dev,static void pci6208_detach (struct comedi_device *dev) { -struct pci6208_private *devpriv = dev->private; - -if (devpriv && devpriv->pci_dev) { +if (dev->pcidev) {if (dev->iobase) -comedi_pci_disable (devpriv->pci_dev); -pci_dev_put (devpriv->pci_dev); +comedi_pci_disable (dev->pcidev); +pci_dev_put (dev->pcidev); } }
Signature · 1 line
1.7.11