diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-18 18:58:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 16:51:36 -0700 |
| commit | 5512a35b38f9cafc217ad123f9e8eea12c585208 (patch) | |
| tree | 28b7c8f93661154ef3da01743132e1b187b65e92 | |
| parent | 606f1295cfe8fd3fe8b4e4f7ca393a5db5e89e44 (diff) | |
| download | linux-3.10-5512a35b38f9cafc217ad123f9e8eea12c585208.tar.gz linux-3.10-5512a35b38f9cafc217ad123f9e8eea12c585208.tar.bz2 linux-3.10-5512a35b38f9cafc217ad123f9e8eea12c585208.zip | |
staging: comedi: dt3000: move the setup_pci() code into the attach
The setup_pci() function simply calls comedi_pci_enable() to enable
the device then ioremaps the pci address. Move the code directly
into the attach function as is more typical for the comedi pci
drivers.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/dt3000.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index 10b43a22cb6..92558e7495f 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c @@ -774,28 +774,6 @@ static int dt3k_mem_insn_read(struct comedi_device *dev, return i; } -static int setup_pci(struct comedi_device *dev) -{ - resource_size_t addr; - int ret; - - ret = comedi_pci_enable(devpriv->pci_dev, "dt3000"); - if (ret < 0) - return ret; - - addr = pci_resource_start(devpriv->pci_dev, 0); - devpriv->phys_addr = addr; - devpriv->io_addr = ioremap(devpriv->phys_addr, DT3000_SIZE); - if (!devpriv->io_addr) - return -ENOMEM; -#if DEBUG - printk("0x%08llx mapped to %p, ", - (unsigned long long)devpriv->phys_addr, devpriv->io_addr); -#endif - - return 0; -} - static struct pci_dev *dt3000_find_pci_dev(struct comedi_device *dev, struct comedi_devconfig *it) { @@ -842,10 +820,15 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -EIO; devpriv->pci_dev = pcidev; - ret = setup_pci(dev); + ret = comedi_pci_enable(pcidev, "dt3000"); if (ret < 0) return ret; + devpriv->phys_addr = pci_resource_start(pcidev, 0); + devpriv->io_addr = ioremap(devpriv->phys_addr, DT3000_SIZE); + if (!devpriv->io_addr) + return -ENOMEM; + dev->board_name = this_board->name; if (request_irq(pcidev->irq, dt3k_interrupt, IRQF_SHARED, |