mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 22:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ni_pcidio: use comedi attach_pci callback

Browse Source 
Convert this PCI driver to use the comedi `attach_pci` callback instead
of the `attach` callback for PCI auto-configuration.  There is no need
to support manual attachment of PCI devices supported by this driver, so
remove the `attach` callback altogether.

Note that this driver still uses the list of PCI "mite" devices created
by the "mite" module.  This will be dealt with by a later patch once
dynamic allocation of "mite" structures has been implemented.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott
2012-09-14 17:34:17 +01:00
committed by Greg Kroah-Hartman
parent 9fb5c14ceb
commit 21b74c2785
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/staging/comedi/drivers/ni_pcidio.c
View File

@@ -1103,34 +1103,36 @@ static int pci_6534_upload_firmware(struct comedi_device *dev)
return ret;
}
static int nidio_find_device(struct comedi_device *dev, int bus, int slot)
/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *nidio_find_mite(struct pci_dev *pcidev)
{
struct mite_struct *mite;
int i;
for (mite = mite_devices; mite; mite = mite->next) {
if (mite->used)
continue;
if (bus || slot) {
if (bus != mite->pcidev->bus->number ||
slot != PCI_SLOT(mite->pcidev->devfn))
continue;
}
for (i = 0; i < n_nidio_boards; i++) {
if (mite_device_id(mite) == nidio_boards[i].dev_id) {
dev->board_ptr = nidio_boards + i;
devpriv->mite = mite;
return 0;
}
}
if (mite->pcidev == pcidev)
return mite;
}
dev_warn(dev->class_dev, "no device found\n");
mite_list_devices();
return -EIO;
return NULL;
}
static int nidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static const struct nidio_board *
nidio_find_boardinfo(struct pci_dev *pcidev)
{
unsigned int dev_id = pcidev->device;
unsigned int n;
for (n = 0; n < ARRAY_SIZE(nidio_boards); n++) {
const struct nidio_board *board = &nidio_boards[n];
if (board->dev_id == dev_id)
return board;
}
return NULL;
}
static int __devinit nidio_attach_pci(struct comedi_device *dev,
struct pci_dev *pcidev)
{
struct comedi_subdevice *s;
int ret;
@@ -1141,9 +1143,12 @@ static int nidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return ret;
spin_lock_init(&devpriv->mite_channel_lock);
ret = nidio_find_device(dev, it->options[0], it->options[1]);
if (ret < 0)
return ret;
dev->board_ptr = nidio_find_boardinfo(pcidev);
if (!dev->board_ptr)
return -ENODEV;
devpriv->mite = nidio_find_mite(pcidev);
if (!devpriv->mite)
return -ENODEV;
ret = mite_setup(devpriv->mite);
if (ret < 0) {
@@ -1226,7 +1231,7 @@ static void nidio_detach(struct comedi_device *dev)
static struct comedi_driver ni_pcidio_driver = {
.driver_name = "ni_pcidio",
.module = THIS_MODULE,
.attach = nidio_attach,
.attach_pci = nidio_attach_pci,
.detach = nidio_detach,
};