staging: comedi: adl_pci7432: use comedi_device pci_dev pointer
PATCH 7/30 staging: comedi: adl_pci7432: 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_pci7432.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/staging/comedi/drivers/adl_pci7432.c +7 -8
@@ -44,7 +44,6 @@ Configuration Options:struct adl_pci7432_private {int data; -struct pci_dev *pci_dev; };#define devpriv ((struct adl_pci7432_private *)dev->private)
@@ -124,16 +123,16 @@ static int adl_pci7432_attach(struct comedi_device *dev,if (ret)return ret; - devpriv->pci_dev =adl_pci7432_find_pci (dev, it); -if (!devpriv->pci_dev) + dev->pcidev =adl_pci7432_find_pci (dev, it); +if (!dev->pcidev)return -EIO ; -if (comedi_pci_enable (devpriv->pci_dev,"adl_pci7432" ) <0 ) { +if (comedi_pci_enable (dev->pcidev,"adl_pci7432" ) <0 ) {printk (KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n" , dev->minor);return -EIO ; } - dev->iobase =pci_resource_start (devpriv->pci_dev,2 ); + dev->iobase =pci_resource_start (dev->pcidev,2 );printk (KERN_INFO "comedi: base addr %4lx\n" , dev->iobase); s = dev->subdevices +0 ;
@@ -162,10 +161,10 @@ static int adl_pci7432_attach(struct comedi_device *dev,static void adl_pci7432_detach (struct comedi_device *dev) { -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