Use the pci_dev pointer in the comedi_device struct instead of
carrying it in the private data.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/adl_pci9111.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c
b/drivers/staging/comedi/drivers/adl_pci9111.c
index c41cfc5..9db36f5 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -338,7 +338,6 @@ static const struct pci9111_board pci9111_boards[] = {
/* Private data structure */
struct pci9111_private_data {
- struct pci_dev *pci_device;
unsigned long io_range; /* PCI6503 io range */
unsigned long lcr_io_base; /* Local configuration register base
@@ -1259,8 +1258,8 @@ static int pci9111_attach(struct comedi_device *dev,
printk(KERN_ERR "comedi%d: " PCI9111_DRIVER_NAME " driver\n",
dev->minor);
- dev_private->pci_device = pci9111_find_pci(dev, it);
- if (!dev_private->pci_device)
+ dev->pcidev = pci9111_find_pci(dev, it);
+ if (!dev->pcidev)
return -EIO;
board = (struct pci9111_board *)dev->board_ptr;
@@ -1269,15 +1268,15 @@ static int pci9111_attach(struct comedi_device *dev,
/* Read local configuration register base address
* [PCI_BASE_ADDRESS #1]. */
- lcr_io_base = pci_resource_start(dev_private->pci_device, 1);
- lcr_io_range = pci_resource_len(dev_private->pci_device, 1);
+ lcr_io_base = pci_resource_start(dev->pcidev, 1);
+ lcr_io_range = pci_resource_len(dev->pcidev, 1);
printk
("comedi%d: local configuration registers at address 0x%4lx
[0x%4lx]\n",
dev->minor, lcr_io_base, lcr_io_range);
/* Enable PCI device and request regions */
- if (comedi_pci_enable(dev_private->pci_device, PCI9111_DRIVER_NAME) <
0) {
+ if (comedi_pci_enable(dev->pcidev, PCI9111_DRIVER_NAME) < 0) {
printk
("comedi%d: Failed to enable PCI device and request
regions\n",
dev->minor);
@@ -1285,8 +1284,8 @@ static int pci9111_attach(struct comedi_device *dev,
}
/* Read PCI6308 register base address [PCI_BASE_ADDRESS #2]. */
- io_base = pci_resource_start(dev_private->pci_device, 2);
- io_range = pci_resource_len(dev_private->pci_device, 2);
+ io_base = pci_resource_start(dev->pcidev, 2);
+ io_range = pci_resource_len(dev->pcidev, 2);
printk(KERN_ERR "comedi%d: 6503 registers at address 0x%4lx [0x%4lx]\n",
dev->minor, io_base, io_range);
@@ -1303,8 +1302,8 @@ static int pci9111_attach(struct comedi_device *dev,
/* Irq setup */
dev->irq = 0;
- if (dev_private->pci_device->irq > 0) {
- dev->irq = dev_private->pci_device->irq;
+ if (dev->pcidev->irq > 0) {
+ dev->irq = dev->pcidev->irq;
if (request_irq(dev->irq, pci9111_interrupt,
IRQF_SHARED, PCI9111_DRIVER_NAME, dev) != 0) {
@@ -1380,10 +1379,10 @@ static void pci9111_detach(struct comedi_device *dev)
}
if (dev->irq != 0)
free_irq(dev->irq, dev);
- if (dev_private != NULL && dev_private->pci_device != NULL) {
+ if (dev->pcidev) {
if (dev->iobase)
- comedi_pci_disable(dev_private->pci_device);
- pci_dev_put(dev_private->pci_device);
+ comedi_pci_disable(dev->pcidev);
+ pci_dev_put(dev->pcidev);
}
}
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
