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>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 0138e00d15227b311da917a07d7b0f679805f684..a7400a25f620aa9c3bb2a5f8f3ad4faa9f53ee56 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/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;

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 4da9db35b8e22fe9712679552d2026306e33abc8..af70c84018806eb8325b20957dcd3131f9f33702 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/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,

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index eab75eb26478164d718d54817b375ee7883aac6a..b7a284ac66498f921b328a99aee9745cb9b4d949 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/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,

diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index f0f891a482a337453a4bf5401bec0697fea5cbfb..fe6897eff3dbc5c7b427c355fb77995adf74eff3 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/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,