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

staging: comedi: addi_apci_*: add module_comedi_pci_driver() 



Pull the module init code out of addi_common.c and add it to
each addi-data driver. Rename the data and functions so they
have namespace associated with the drivers.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c33ef61f

drivers/staging/comedi/drivers/addi-data/addi_common.c

+0 −30
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		v_pci_card_list_init(this_board->i_VendorId, 1);	/* 1 for displaying the list.. */

		pci_list_builded = 1;

	}

	/* printk("comedi%d: "ADDIDATA_DRIVER_NAME": board=%s",dev->minor,this_board->pc_DriverName); */



	if ((this_board->i_Dma) && (it->options[2] == 0)) {

		i_Dma = 1;
@@ -466,32 +465,3 @@ static void i_ADDI_Detach(struct comedi_device *dev) 
		}

	}

}
 


static struct comedi_driver addi_driver = {

	.driver_name	= ADDIDATA_DRIVER_NAME,

	.module		= THIS_MODULE,

	.attach		= i_ADDI_Attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(boardtypes),

	.board_name	= &boardtypes[0].pc_DriverName,

	.offset		= sizeof(struct addi_board),

};



static int __devinit addi_pci_probe(struct pci_dev *dev,

				    const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, &addi_driver);

}



static void __devexit addi_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static struct pci_driver addi_pci_driver = {

	.name		= ADDIDATA_DRIVER_NAME,

	.id_table	= addi_apci_tbl,

	.probe		= &addi_pci_probe,

	.remove		= __devexit_p(&addi_pci_remove),

};

module_comedi_pci_driver(addi_driver, addi_pci_driver);

drivers/staging/comedi/drivers/addi_apci_035.c

+32 −6
Original line number Diff line number Diff line
@@ -6,12 +6,11 @@ 


#define ADDIDATA_WATCHDOG 2	/*  Or shold it be something else */



#define ADDIDATA_DRIVER_NAME	"addi_apci_035"



#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci035.c"

#include "addi-data/addi_common.c"



static const struct addi_board boardtypes[] = {

static const struct addi_board apci035_boardtypes[] = {

	{

		.pc_DriverName		= "apci035",

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA,
@@ -38,13 +37,40 @@ static const struct addi_board boardtypes[] = { 
	},

};



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

static struct comedi_driver apci035_driver = {

	.driver_name	= "addi_apci_035",

	.module		= THIS_MODULE,

	.attach		= i_ADDI_Attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci035_boardtypes),

	.board_name	= &apci035_boardtypes[0].pc_DriverName,

	.offset		= sizeof(struct addi_board),

};



static int __devinit apci035_pci_probe(struct pci_dev *dev,

				       const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, &apci035_driver);

}



static void __devexit apci035_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);

MODULE_DEVICE_TABLE(pci, apci035_pci_table);



#include "addi-data/addi_common.c"

static struct pci_driver apci035_pci_driver = {

	.name		= "addi_apci_035",

	.id_table	= apci035_pci_table,

	.probe		= apci035_pci_probe,

	.remove		= __devexit_p(apci035_pci_remove),

};

module_comedi_pci_driver(apci035_driver, apci035_pci_driver);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

drivers/staging/comedi/drivers/addi_apci_1032.c

+32 −6
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
#include "addi-data/addi_common.h"

#include "addi-data/addi_amcc_s5933.h"



#define ADDIDATA_DRIVER_NAME	"addi_apci_1032"



#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1032.c"

#include "addi-data/addi_common.c"



static const struct addi_board boardtypes[] = {

static const struct addi_board apci1032_boardtypes[] = {

	{

		.pc_DriverName		= "apci1032",

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA,
@@ -27,13 +26,40 @@ static const struct addi_board boardtypes[] = { 
	},

};



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

static struct comedi_driver apci1032_driver = {

	.driver_name	= "addi_apci_1032",

	.module		= THIS_MODULE,

	.attach		= i_ADDI_Attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci1032_boardtypes),

	.board_name	= &apci1032_boardtypes[0].pc_DriverName,

	.offset		= sizeof(struct addi_board),

};



static int __devinit apci1032_pci_probe(struct pci_dev *dev,

					const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, &apci1032_driver);

}



static void __devexit apci1032_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);

MODULE_DEVICE_TABLE(pci, apci1032_pci_table);



#include "addi-data/addi_common.c"

static struct pci_driver apci1032_pci_driver = {

	.name		= "addi_apci_1032",

	.id_table	= apci1032_pci_table,

	.probe		= apci1032_pci_probe,

	.remove		= __devexit_p(apci1032_pci_remove),

};

module_comedi_pci_driver(apci1032_driver, apci1032_pci_driver);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

drivers/staging/comedi/drivers/addi_apci_1500.c

+32 −6
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
#include "addi-data/addi_common.h"

#include "addi-data/addi_amcc_s5933.h"



#define ADDIDATA_DRIVER_NAME	"addi_apci_1500"



#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1500.c"

#include "addi-data/addi_common.c"



static const struct addi_board boardtypes[] = {

static const struct addi_board apci1500_boardtypes[] = {

	{

		.pc_DriverName		= "apci1500",

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
@@ -38,13 +37,40 @@ static const struct addi_board boardtypes[] = { 
	},

};



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

static struct comedi_driver apci1500_driver = {

	.driver_name	= "addi_apci_1500",

	.module		= THIS_MODULE,

	.attach		= i_ADDI_Attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci1500_boardtypes),

	.board_name	= &apci1500_boardtypes[0].pc_DriverName,

	.offset		= sizeof(struct addi_board),

};



static int __devinit apci1500_pci_probe(struct pci_dev *dev,

					const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, &apci1500_driver);

}



static void __devexit apci1500_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);

MODULE_DEVICE_TABLE(pci, apci1500_pci_table);



#include "addi-data/addi_common.c"

static struct pci_driver apci1500_pci_driver = {

	.name		= "addi_apci_1500",

	.id_table	= apci1500_pci_table,

	.probe		= apci1500_pci_probe,

	.remove		= __devexit_p(apci1500_pci_remove),

};

module_comedi_pci_driver(apci1500_driver, apci1500_pci_driver);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

drivers/staging/comedi/drivers/addi_apci_1516.c

+32 −6
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
#include "addi-data/addi_common.h"

#include "addi-data/addi_amcc_s5933.h"



#define ADDIDATA_DRIVER_NAME	"addi_apci_1516"



#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1516.c"

#include "addi-data/addi_common.c"



static const struct addi_board boardtypes[] = {

static const struct addi_board apci1516_boardtypes[] = {

	{

		.pc_DriverName		= "apci1516",

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA,
@@ -34,13 +33,40 @@ static const struct addi_board boardtypes[] = { 
	},

};



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

static struct comedi_driver apci1516_driver = {

	.driver_name	= "addi_apci_1516",

	.module		= THIS_MODULE,

	.attach		= i_ADDI_Attach,

	.detach		= i_ADDI_Detach,

	.num_names	= ARRAY_SIZE(apci1516_boardtypes),

	.board_name	= &apci1516_boardtypes[0].pc_DriverName,

	.offset		= sizeof(struct addi_board),

};



static int __devinit apci1516_pci_probe(struct pci_dev *dev,

					const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, &apci1516_driver);

}



static void __devexit apci1516_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1001) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);

MODULE_DEVICE_TABLE(pci, apci1516_pci_table);



#include "addi-data/addi_common.c"

static struct pci_driver apci1516_pci_driver = {

	.name		= "addi_apci_1516",

	.id_table	= apci1516_pci_table,

	.probe		= apci1516_pci_probe,

	.remove		= __devexit_p(apci1516_pci_remove),

};

module_comedi_pci_driver(apci1516_driver, apci1516_pci_driver);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");