iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: icp_multi: convert to a pci_driver

Browse Source 
This driver is for a PCI device not a legacy device.

Convert it from a module_comedi_driver to a module_comedi_pci_driver.
This will allow using the comedi_pci_auto_config mechanism to attach
to the device.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-09-11 13:44:59 -07:00 committed by Greg Kroah-Hartman
parent 6f2c12ae42
commit 554e02c924
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/comedi/drivers/icp_multi.c
View File

@ -58,7 +58,7 @@ Options:
#include "icp_multi.h"
#define DEVICE_ID 0x8000 /* Device ID */
#define PCI_DEVICE_ID_ICP_MULTI 0x8000
#define ICP_MULTI_EXTDEBUG
@ -1025,7 +1025,7 @@ static void icp_multi_detach(struct comedi_device *dev)
static const struct boardtype boardtypes[] = {
{
.name = "icp_multi",
.device_id = DEVICE_ID,
.device_id = PCI_DEVICE_ID_ICP_MULTI,
.iorange = IORANGE_ICP_MULTI,
.have_irq = 1,
.cardtype = TYPE_ICP_MULTI,
@ -1052,7 +1052,31 @@ static struct comedi_driver icp_multi_driver = {
.board_name = &boardtypes[0].name,
.offset = sizeof(struct boardtype),
};
module_comedi_driver(icp_multi_driver);
static int __devinit icp_multi_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &icp_multi_driver);
}
static void __devexit icp_multi_pci_remove(struct pci_dev *dev)
{
comedi_pci_auto_unconfig(dev);
}
static DEFINE_PCI_DEVICE_TABLE(icp_multi_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_ICP, PCI_DEVICE_ID_ICP_MULTI) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, icp_multi_pci_table);
static struct pci_driver icp_multi_pci_driver = {
.name = "icp_multi",
.id_table = icp_multi_pci_table,
.probe = icp_multi_pci_probe,
.remove = __devexit_p(icp_multi_pci_remove),
};
module_comedi_pci_driver(icp_multi_driver, icp_multi_pci_driver);
MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");