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

staging: comedi: addi-data: remove the MODULE_DEVICE_TABLE #ifdef'ery 



Move the MODULE_DEVICE_TABLE for each addi-data driver from addi_common.c
to the individual driver files. This removes the need #ifdef'ery.

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 bf6a1578

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

+0 −79
Original line number Original line Diff line number Diff line
@@ -58,85 +58,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour 
#define COMEDI_SUBD_TTLIO   11	/* Digital Input Output But TTL */

#define COMEDI_SUBD_TTLIO   11	/* Digital Input Output But TTL */

#endif

#endif





static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

#ifdef CONFIG_APCI_3120

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x818D)},

#endif

#ifdef CONFIG_APCI_1032

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003)},

#endif

#ifdef CONFIG_APCI_1516

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1001)},

#endif

#ifdef CONFIG_APCI_2016

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1002)},

#endif

#ifdef CONFIG_APCI_2032

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1004)},

#endif

#ifdef CONFIG_APCI_2200

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1005)},

#endif

#ifdef CONFIG_APCI_1564

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006)},

#endif

#ifdef CONFIG_APCI_1500

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc)},

#endif

#ifdef CONFIG_APCI_3001

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x828D)},

#endif

#ifdef CONFIG_APCI_3501

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001)},

#endif

#ifdef CONFIG_APCI_035

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300)},

#endif

#ifdef CONFIG_APCI_3200

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3000)},

#endif

#ifdef CONFIG_APCI_3300

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3007)},

#endif

#ifdef CONFIG_APCI_1710

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, APCI1710_BOARD_DEVICE_ID)},

#endif

#ifdef CONFIG_APCI_16XX

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100A)},

#endif

#ifdef CONFIG_APCI_3XXX

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3010)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300F)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300E)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3013)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3014)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3015)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3016)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3017)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3018)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3019)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301A)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301B)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301C)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301D)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301E)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301F)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3020)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3021)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3022)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3023)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300B)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3002)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3003)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3004)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3024)},

#endif

	{0}

};



MODULE_DEVICE_TABLE(pci, addi_apci_tbl);



static const struct addi_board boardtypes[] = {

static const struct addi_board boardtypes[] = {

#ifdef CONFIG_APCI_3120

#ifdef CONFIG_APCI_3120

	{

	{

drivers/staging/comedi/drivers/addi_apci_035.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,13 @@ 




#include "addi-data/addi_eeprom.c"

#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci035.c"

#include "addi-data/hwdrv_apci035.c"



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);



#include "addi-data/addi_common.c"

#include "addi-data/addi_common.c"





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

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

drivers/staging/comedi/drivers/addi_apci_1032.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,13 @@ 




#include "addi-data/addi_eeprom.c"

#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1032.c"

#include "addi-data/hwdrv_apci1032.c"



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);



#include "addi-data/addi_common.c"

#include "addi-data/addi_common.c"





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

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

drivers/staging/comedi/drivers/addi_apci_1500.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,13 @@ 




#include "addi-data/addi_eeprom.c"

#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1500.c"

#include "addi-data/hwdrv_apci1500.c"



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);



#include "addi-data/addi_common.c"

#include "addi-data/addi_common.c"





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

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

drivers/staging/comedi/drivers/addi_apci_1516.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,13 @@ 




#include "addi-data/addi_eeprom.c"

#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1516.c"

#include "addi-data/hwdrv_apci1516.c"



static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1001) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, addi_apci_tbl);



#include "addi-data/addi_common.c"

#include "addi-data/addi_common.c"





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

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