AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-24 15:43:14 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: adl_pci7296: factor out the PCI device code

Browse Source 
Factor out the code that finds a matching PCI device from attach
function. This allows reducing the indent level of the remaining
code in the attach function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-05-23 14:28:47 -07:00 committed by Greg Kroah-Hartman
parent fc330f4589
commit 262ea0d476
1 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
drivers/staging/comedi/drivers/adl_pci7296.c
View File

@ -54,19 +54,40 @@ struct adl_pci7296_private {
#define devpriv ((struct adl_pci7296_private *)dev->private) #define devpriv ((struct adl_pci7296_private *)dev->private)
static struct pci_dev *adl_pci7296_find_pci(struct comedi_device *dev,
struct comedi_devconfig *it)
{
struct pci_dev *pcidev = NULL;
int bus = it->options[0];
int slot = it->options[1];
for_each_pci_dev(pcidev) {
if (pcidev->vendor != PCI_VENDOR_ID_ADLINK ||
pcidev->device != PCI_DEVICE_ID_PCI7296)
continue;
if (bus || slot) {
/* requested particular bus/slot */
if (pcidev->bus->number != bus ||
PCI_SLOT(pcidev->devfn) != slot)
continue;
}
return pcidev;
}
printk(KERN_ERR
"comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, bus, slot);
return NULL;
}
static int adl_pci7296_attach(struct comedi_device *dev, static int adl_pci7296_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
struct pci_dev *pcidev = NULL;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int bus, slot;
int ret; int ret;
printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor); printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor);
dev->board_name = "pci7432"; dev->board_name = "pci7432";
bus = it->options[0];
slot = it->options[1];
if (alloc_private(dev, sizeof(struct adl_pci7296_private)) < 0) if (alloc_private(dev, sizeof(struct adl_pci7296_private)) < 0)
return -ENOMEM; return -ENOMEM;
@ -74,63 +95,45 @@ static int adl_pci7296_attach(struct comedi_device *dev,
if (alloc_subdevices(dev, 4) < 0) if (alloc_subdevices(dev, 4) < 0)
return -ENOMEM; return -ENOMEM;
for_each_pci_dev(pcidev) { devpriv->pci_dev = adl_pci7296_find_pci(dev, it);
if (pcidev->vendor == PCI_VENDOR_ID_ADLINK && if (!devpriv->pci_dev)
pcidev->device == PCI_DEVICE_ID_PCI7296) { return -EIO;
if (bus || slot) {
/* requested particular bus/slot */
if (pcidev->bus->number != bus
|| PCI_SLOT(pcidev->devfn) != slot) {
continue;
}
}
devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) {
printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",
dev->minor);
return -EIO;
}
dev->iobase = pci_resource_start(pcidev, 2); if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7296") < 0) {
printk(KERN_INFO "comedi: base addr %4lx\n", printk(KERN_ERR
dev->iobase); "comedi%d: Failed to enable PCI device and request regions\n",
dev->minor);
/* four 8255 digital io subdevices */ return -EIO;
s = dev->subdevices + 0;
subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase));
s = dev->subdevices + 1;
ret = subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase +
PORT2A));
if (ret < 0)
return ret;
s = dev->subdevices + 2;
ret = subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase +
PORT3A));
if (ret < 0)
return ret;
s = dev->subdevices + 3;
ret = subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase +
PORT4A));
if (ret < 0)
return ret;
printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n",
dev->minor);
return 1;
}
} }
printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n", dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
dev->minor, bus, slot); printk(KERN_INFO "comedi: base addr %4lx\n", dev->iobase);
return -EIO;
/* four 8255 digital io subdevices */
s = dev->subdevices + 0;
subdev_8255_init(dev, s, NULL, (unsigned long)(dev->iobase));
s = dev->subdevices + 1;
ret = subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase + PORT2A));
if (ret < 0)
return ret;
s = dev->subdevices + 2;
ret = subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase + PORT3A));
if (ret < 0)
return ret;
s = dev->subdevices + 3;
ret = subdev_8255_init(dev, s, NULL,
(unsigned long)(dev->iobase + PORT4A));
if (ret < 0)
return ret;
printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n", dev->minor);
return 0;
} }
static void adl_pci7296_detach(struct comedi_device *dev) static void adl_pci7296_detach(struct comedi_device *dev)