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

staging: comedi: adl_pci7230: store the pci_dev in the comedi_device

Browse Source 
Use the hw_dev pointer in the comedi_device struct to hold the
pci_dev instead of carrying it in the private data.

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-07-18 18:24:57 -07:00 committed by Greg Kroah-Hartman
parent f8ec639268
commit 807856bf94
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/comedi/drivers/adl_pci7230.c
View File

@ -44,7 +44,6 @@ Configuration Options:
struct adl_pci7230_private { struct adl_pci7230_private {
int data; int data;
struct pci_dev *pci_dev;
}; };
#define devpriv ((struct adl_pci7230_private *)dev->private) #define devpriv ((struct adl_pci7230_private *)dev->private)
@ -102,6 +101,7 @@ static int adl_pci7230_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
struct comedi_subdevice *s; struct comedi_subdevice *s;
struct pci_dev *pcidev;
int ret; int ret;
printk(KERN_INFO "comedi%d: adl_pci7230\n", dev->minor); printk(KERN_INFO "comedi%d: adl_pci7230\n", dev->minor);
@ -115,16 +115,17 @@ static int adl_pci7230_attach(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
devpriv->pci_dev = adl_pci7230_find_pci(dev, it); pcidev = adl_pci7230_find_pci(dev, it);
if (!devpriv->pci_dev) if (!pcidev)
return -EIO; return -EIO;
comedi_set_hw_dev(dev, &pcidev->dev);
if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7230") < 0) { if (comedi_pci_enable(pcidev, "adl_pci7230") < 0) {
printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n", printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",
dev->minor); dev->minor);
return -EIO; return -EIO;
} }
dev->iobase = pci_resource_start(devpriv->pci_dev, 2); dev->iobase = pci_resource_start(pcidev, 2);
printk(KERN_DEBUG "comedi: base addr %4lx\n", dev->iobase); printk(KERN_DEBUG "comedi: base addr %4lx\n", dev->iobase);
s = dev->subdevices + 0; s = dev->subdevices + 0;
@ -152,10 +153,12 @@ static int adl_pci7230_attach(struct comedi_device *dev,
static void adl_pci7230_detach(struct comedi_device *dev) static void adl_pci7230_detach(struct comedi_device *dev)
{ {
if (devpriv && devpriv->pci_dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev);
if (pcidev) {
if (dev->iobase) if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(pcidev);
pci_dev_put(devpriv->pci_dev); pci_dev_put(pcidev);
} }
} }