Skip to content

Commit

Permalink
staging: comedi: amplc_pci224: Change return type of pci224_find_pci()
Browse files Browse the repository at this point in the history
pci224_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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent eedc1b7 commit 01ea83b
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions drivers/staging/comedi/drivers/amplc_pci224.c
Original file line number Diff line number Diff line change
Expand Up @@ -1255,14 +1255,11 @@ static const struct pci224_board
* This function looks for a PCI device matching the requested board name,
* bus and slot.
*/
static int
pci224_find_pci(struct comedi_device *dev, int bus, int slot,
struct pci_dev **pci_dev_p)
static struct pci_dev *
pci224_find_pci(struct comedi_device *dev, int bus, int slot)
{
struct pci_dev *pci_dev = NULL;

*pci_dev_p = NULL;

/* Look for matching PCI device. */
for (pci_dev = pci_get_device(PCI_VENDOR_ID_AMPLICON, PCI_ANY_ID, NULL);
pci_dev != NULL;
Expand All @@ -1289,8 +1286,7 @@ pci224_find_pci(struct comedi_device *dev, int bus, int slot,
}

/* Found a match. */
*pci_dev_p = pci_dev;
return 0;
return pci_dev;
}
/* No match found. */
if (bus || slot) {
Expand All @@ -1301,7 +1297,7 @@ pci224_find_pci(struct comedi_device *dev, int bus, int slot,
dev_err(dev->class_dev, "error! no %s found!\n",
thisboard->name);
}
return -EIO;
return NULL;
}

static void pci224_report_attach(struct comedi_device *dev, unsigned int irq)
Expand Down Expand Up @@ -1488,9 +1484,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return ret;
}

ret = pci224_find_pci(dev, bus, slot, &pci_dev);
if (ret < 0)
return ret;
pci_dev = pci224_find_pci(dev, bus, slot);
if (pci_dev == NULL)
return -EIO;

return pci224_attach_common(dev, pci_dev, it->options);
}
Expand Down

0 comments on commit 01ea83b

Please sign in to comment.