Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554e02c9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: icp_multi: convert to a pci_driver 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f2c12ae

drivers/staging/comedi/drivers/icp_multi.c

+27 −3
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V 




#include "icp_multi.h"

#include "icp_multi.h"





#define DEVICE_ID	0x8000	/* Device ID */

#define PCI_DEVICE_ID_ICP_MULTI	0x8000





#define ICP_MULTI_EXTDEBUG

#define ICP_MULTI_EXTDEBUG
@@ -1025,7 +1025,7 @@ static void icp_multi_detach(struct comedi_device *dev) 
static const struct boardtype boardtypes[] = {

static const struct boardtype boardtypes[] = {

	{

	{

		.name		= "icp_multi",

		.name		= "icp_multi",

		.device_id	= DEVICE_ID,

		.device_id	= PCI_DEVICE_ID_ICP_MULTI,

		.iorange	= IORANGE_ICP_MULTI,

		.iorange	= IORANGE_ICP_MULTI,

		.have_irq	= 1,

		.have_irq	= 1,

		.cardtype	= TYPE_ICP_MULTI,

		.cardtype	= TYPE_ICP_MULTI,
@@ -1052,7 +1052,31 @@ static struct comedi_driver icp_multi_driver = { 
	.board_name	= &boardtypes[0].name,

	.board_name	= &boardtypes[0].name,

	.offset		= sizeof(struct boardtype),

	.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_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

MODULE_DESCRIPTION("Comedi low-level driver");