OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2012-07-18 18:58:07 -07:00 committed by Greg Kroah-Hartman
parent 606f1295cf
commit 5512a35b38
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/staging/comedi/drivers/dt3000.c
View File

@ -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,