Remove the private range, ao_ranges_60xx, in this driver and use
the comedi provided range_bipolar10 instead.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c 
b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 6988f5b..584fdff 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -543,13 +543,6 @@ static const int ao_range_code_64xx[] = {
        0x3,
 };
 
-static const struct comedi_lrange ao_ranges_60xx = {
-       1,
-       {
-        BIP_RANGE(10),
-        }
-};
-
 static const int ao_range_code_60xx[] = {
        0x0,
 };
@@ -762,7 +755,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
                .ao_bits        = 16,
                .layout         = LAYOUT_60XX,
                .ai_range_table = &ai_ranges_60xx,
-               .ao_range_table = &ao_ranges_60xx,
+               .ao_range_table = &range_bipolar10,
                .ao_range_code  = ao_range_code_60xx,
                .ai_fifo        = &ai_fifo_60xx,
                .has_8255       = 0,
@@ -777,7 +770,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
                .ao_scan_speed  = 100000,
                .layout         = LAYOUT_60XX,
                .ai_range_table = &ai_ranges_60xx,
-               .ao_range_table = &ao_ranges_60xx,
+               .ao_range_table = &range_bipolar10,
                .ao_range_code  = ao_range_code_60xx,
                .ai_fifo        = &ai_fifo_60xx,
                .has_8255       = 0,
@@ -791,7 +784,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
                .ao_scan_speed  = 100000,
                .layout         = LAYOUT_60XX,
                .ai_range_table = &ai_ranges_60xx,
-               .ao_range_table = &ao_ranges_60xx,
+               .ao_range_table = &range_bipolar10,
                .ao_range_code  = ao_range_code_60xx,
                .ai_fifo        = &ai_fifo_60xx,
                .has_8255       = 1,
@@ -806,7 +799,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
                .ao_scan_speed  = 100000,
                .layout         = LAYOUT_60XX,
                .ai_range_table = &ai_ranges_60xx,
-               .ao_range_table = &ao_ranges_60xx,
+               .ao_range_table = &range_bipolar10,
                .ao_range_code  = ao_range_code_60xx,
                .ai_fifo        = &ai_fifo_60xx,
                .has_8255       = 1,
@@ -885,7 +878,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
                .ao_scan_speed  = 100000,
                .layout         = LAYOUT_60XX,
                .ai_range_table = &ai_ranges_60xx,
-               .ao_range_table = &ao_ranges_60xx,
+               .ao_range_table = &range_bipolar10,
                .ao_range_code  = ao_range_code_60xx,
                .ai_fifo        = &ai_fifo_60xx,
                .has_8255       = 0,
@@ -900,7 +893,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
                .ao_scan_speed  = 100000,
                .layout         = LAYOUT_60XX,
                .ai_range_table = &ai_ranges_60xx,
-               .ao_range_table = &ao_ranges_60xx,
+               .ao_range_table = &range_bipolar10,
                .ao_range_code  = ao_range_code_60xx,
                .ai_fifo        = &ai_fifo_60xx,
                .has_8255       = 0,
-- 
1.8.1.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to