staging: comedi: addi_data: remove pr_TTLRangelist

All the addi driver ttl subdevices use the range table
'range_digital' provided by the comedi core. The boardinfo
value  'pr_TTLRangeList' is not used by the drivers. Remove
the unused range tables and the boardinfo pointer.

The unused range tables don't make sense anyway...

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: 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.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index a5aa673..a3d4ed2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -613,7 +613,6 @@ static const struct addi_board boardtypes[] = {
                .i_IorangeBase0         = 128,
                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
                .i_NbrTTLChannel        = 48,
-               .pr_TTLRangelist        = &range_apci16xx_ttl,
                .reset                  = i_APCI16XX_Reset,
                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
@@ -626,7 +625,6 @@ static const struct addi_board boardtypes[] = {
                .i_IorangeBase0         = 128,
                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
                .i_NbrTTLChannel        = 96,
-               .pr_TTLRangelist        = &range_apci16xx_ttl,
                .reset                  = i_APCI16XX_Reset,
                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
@@ -651,7 +649,6 @@ static const struct addi_board boardtypes[] = {
                .i_AiMaxdata            = 4095,
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -678,7 +675,6 @@ static const struct addi_board boardtypes[] = {
                .i_AiMaxdata            = 4095,
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -705,7 +701,6 @@ static const struct addi_board boardtypes[] = {
                .i_AiMaxdata            = 4095,
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -732,7 +727,6 @@ static const struct addi_board boardtypes[] = {
                .i_AiMaxdata            = 65535,
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -759,7 +753,6 @@ static const struct addi_board boardtypes[] = {
                .i_AiMaxdata            = 65535,
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -786,7 +779,6 @@ static const struct addi_board boardtypes[] = {
                .i_AiMaxdata            = 65535,
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -816,7 +808,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -851,7 +842,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -886,7 +876,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -921,7 +910,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -956,7 +944,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -991,7 +978,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1026,7 +1012,6 @@ static const struct addi_board boardtypes[] = {
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .pr_AoRangelist         = &range_apci3XXX_ao,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1057,7 +1042,6 @@ static const struct addi_board boardtypes[] = {
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .pr_AoRangelist         = &range_apci3XXX_ao,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1088,7 +1072,6 @@ static const struct addi_board boardtypes[] = {
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .pr_AoRangelist         = &range_apci3XXX_ao,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1119,7 +1102,6 @@ static const struct addi_board boardtypes[] = {
                .pr_AiRangelist         = &range_apci3XXX_ai,
                .pr_AoRangelist         = &range_apci3XXX_ao,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 10000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1153,7 +1135,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1192,7 +1173,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1231,7 +1211,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1270,7 +1249,6 @@ static const struct addi_board boardtypes[] = {
                .i_NbrDoChannel         = 4,
                .i_DoMaxdata            = 1,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .b_AvailableConvertUnit = 6,
                .ui_MinAcquisitiontimeNs = 5000,
                .interrupt              = v_APCI3XXX_Interrupt,
@@ -1413,7 +1391,6 @@ static const struct addi_board boardtypes[] = {
                .i_AoMaxdata            = 4095,
                .pr_AoRangelist         = &range_apci3XXX_ao,
                .i_NbrTTLChannel        = 24,
-               .pr_TTLRangelist        = &range_apci3XXX_ttl,
                .interrupt              = v_APCI3XXX_Interrupt,
                .reset                  = i_APCI3XXX_Reset,
                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 2c3f347..b7bbb71 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -85,7 +85,6 @@ struct addi_board {
        int i_DoMaxdata;        /*  data to set all channels high */
 
        int i_NbrTTLChannel;    /*  Number of TTL channels */
-       const struct comedi_lrange *pr_TTLRangelist;    /* rangelist for TTL */
 
        int i_Dma;              /*  dma present or not */
        int i_Timer;            /*    timer subdevice present or not */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
index 5bf91e1..a12df4b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
@@ -41,21 +41,6 @@
 
 #ifdef __KERNEL__
 
-static const struct comedi_lrange range_apci16xx_ttl = { 12,
-       {BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1),
-        BIP_RANGE(1)}
-};
-
 /*
 +----------------------------------------------------------------------------+
 |                       TTL INISIALISATION FUNCTION                          |

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
index cce9e12..e10b7e5 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
@@ -42,20 +42,6 @@ static const struct comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
                                                     UNI_RANGE(1)}
 };
 
-static const struct comedi_lrange range_apci3XXX_ttl = { 12, {BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1),
-                                                      BIP_RANGE(1)}
-};
-
 static const struct comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
                                                     UNI_RANGE(10)}
 };