Ver Fonte

staging: comedi: addi_common.h: remove ADDIDATA_* defines

These defines don't add any additional clarity to the addi_data drivers.
Just remove them.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten há 11 anos atrás
pai
commit
952091f123

+ 0 - 5
drivers/staging/comedi/drivers/addi-data/addi_common.h

@@ -18,11 +18,6 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 
-#define ADDIDATA_EEPROM		1
-#define ADDIDATA_NO_EEPROM	0
-#define ADDIDATA_93C76		"93C76"
-#define ADDIDATA_S5920		"S5920"
-
 struct addi_board {
 	const char *pc_DriverName;	/*  driver name */
 	int i_IorangeBase1;

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_035.c

@@ -18,7 +18,7 @@ static const struct addi_board apci035_boardtypes[] = {
 		.pc_DriverName		= "apci035",
 		.i_IorangeBase1		= APCI035_ADDRESS_RANGE,
 		.i_PCIEeprom		= 1,
-		.pc_EepromChip		= ADDIDATA_S5920,
+		.pc_EepromChip		= "S5920",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
 		.i_AiChannelList	= 16,

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_1500.c

@@ -15,7 +15,7 @@ static const struct addi_board apci1500_boardtypes[] = {
 	{
 		.pc_DriverName		= "apci1500",
 		.i_IorangeBase1		= APCI1500_ADDRESS_RANGE,
-		.i_PCIEeprom		= ADDIDATA_NO_EEPROM,
+		.i_PCIEeprom		= 0,
 		.i_NbrDiChannel		= 16,
 		.i_NbrDoChannel		= 16,
 		.i_DoMaxdata		= 0xffff,

+ 4 - 4
drivers/staging/comedi/drivers/addi_apci_3200.c

@@ -32,8 +32,8 @@ static const struct addi_board apci3200_boardtypes[] = {
 	[BOARD_APCI3200] = {
 		.pc_DriverName		= "apci3200",
 		.i_IorangeBase1		= 256,
-		.i_PCIEeprom		= ADDIDATA_EEPROM,
-		.pc_EepromChip		= ADDIDATA_S5920,
+		.i_PCIEeprom		= 1,
+		.pc_EepromChip		= "S5920",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
 		.i_AiChannelList	= 16,
@@ -58,8 +58,8 @@ static const struct addi_board apci3200_boardtypes[] = {
 	[BOARD_APCI3300] = {
 		.pc_DriverName		= "apci3300",
 		.i_IorangeBase1		= 256,
-		.i_PCIEeprom		= ADDIDATA_EEPROM,
-		.pc_EepromChip		= ADDIDATA_S5920,
+		.i_PCIEeprom		= 1,
+		.pc_EepromChip		= "S5920",
 		.i_NbrAiChannelDiff	= 8,
 		.i_AiChannelList	= 8,
 		.i_AiMaxdata		= 0x3ffff,