Commit db7c275d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: adl_pci6208: remove pci6208_pci_setup()



Refactor pci6208_pci_setup() into the attach function. This
function simply enables the pci device and gets the PCI iobase
address used by the driver. There's no need for a separate
function to handle this.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a28c9852
......@@ -225,28 +225,6 @@ static struct pci_dev *pci6208_find_device(struct comedi_device *dev,
return NULL;
}
static int
pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
int dev_minor)
{
unsigned long io_base;
/* Enable PCI device and request regions */
if (comedi_pci_enable(pci_dev, "adl_pci6208") < 0) {
printk(KERN_ERR "comedi%d: Failed to enable PCI device "
"and request regions\n",
dev_minor);
return -EIO;
}
/* Read PCI6208 register base address [PCI_BASE_ADDRESS #2]. */
io_base = pci_resource_start(pci_dev, 2);
*io_base_ptr = io_base;
return 0;
}
static int pci6208_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
......@@ -254,7 +232,6 @@ static int pci6208_attach(struct comedi_device *dev,
struct pci6208_private *devpriv;
struct comedi_subdevice *s;
int retval;
unsigned long io_base;
printk(KERN_INFO "comedi%d: pci6208: ", dev->minor);
......@@ -268,11 +245,14 @@ static int pci6208_attach(struct comedi_device *dev,
return -EIO;
thisboard = comedi_board(dev);
retval = pci6208_pci_setup(devpriv->pci_dev, &io_base, dev->minor);
if (retval < 0)
return retval;
if (comedi_pci_enable(devpriv->pci_dev, "adl_pci6208") < 0) {
dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n");
return -EIO;
}
dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
dev->iobase = io_base;
dev->board_name = thisboard->name;
retval = comedi_alloc_subdevices(dev, 2);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment