Commit 7ac75ba4 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: amplc_pc263: Change return type of pc263_find_pci()

pc263_find_pci() finds a supported PCI device, returning 0 on success
or -EIO on failure and returning the pointer to the PCI device via a
struct pci_dev ** parameter.  Change it to return the struct pci_dev *
on success or NULL on failure.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ac68252
...@@ -113,14 +113,11 @@ struct pc263_private { ...@@ -113,14 +113,11 @@ struct pc263_private {
* This function looks for a PCI device matching the requested board name, * This function looks for a PCI device matching the requested board name,
* bus and slot. * bus and slot.
*/ */
static int static struct pci_dev *
pc263_find_pci(struct comedi_device *dev, int bus, int slot, pc263_find_pci(struct comedi_device *dev, int bus, int slot)
struct pci_dev **pci_dev_p)
{ {
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
*pci_dev_p = NULL;
/* Look for matching PCI device. */ /* Look for matching PCI device. */
for (pci_dev = pci_get_device(PCI_VENDOR_ID_AMPLICON, PCI_ANY_ID, NULL); for (pci_dev = pci_get_device(PCI_VENDOR_ID_AMPLICON, PCI_ANY_ID, NULL);
pci_dev != NULL; pci_dev != NULL;
...@@ -154,8 +151,7 @@ pc263_find_pci(struct comedi_device *dev, int bus, int slot, ...@@ -154,8 +151,7 @@ pc263_find_pci(struct comedi_device *dev, int bus, int slot,
} }
/* Found a match. */ /* Found a match. */
*pci_dev_p = pci_dev; return pci_dev;
return 0;
} }
/* No match found. */ /* No match found. */
if (bus || slot) { if (bus || slot) {
...@@ -166,7 +162,7 @@ pc263_find_pci(struct comedi_device *dev, int bus, int slot, ...@@ -166,7 +162,7 @@ pc263_find_pci(struct comedi_device *dev, int bus, int slot,
dev_err(dev->class_dev, "error! no %s found!\n", dev_err(dev->class_dev, "error! no %s found!\n",
thisboard->name); thisboard->name);
} }
return -EIO; return NULL;
} }
/* /*
* This function checks and requests an I/O region, reporting an error * This function checks and requests an I/O region, reporting an error
...@@ -251,9 +247,9 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -251,9 +247,9 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} }
bus = it->options[0]; bus = it->options[0];
slot = it->options[1]; slot = it->options[1];
ret = pc263_find_pci(dev, bus, slot, &pci_dev); pci_dev = pc263_find_pci(dev, bus, slot);
if (ret < 0) if (pci_dev == NULL)
return ret; return -EIO;
devpriv->pci_dev = pci_dev; devpriv->pci_dev = pci_dev;
ret = comedi_pci_enable(pci_dev, PC263_DRIVER_NAME); ret = comedi_pci_enable(pci_dev, PC263_DRIVER_NAME);
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
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