From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 3 Apr 2013 20:39:14 +0000 (-0700)
Subject: staging: comedi: ni_pcimio: use comedi provided range_bipolar10
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a4f6d9ca8cb6ca95f183face76c2b7bee3571d2f;p=deliverable%2Flinux.git

staging: comedi: ni_pcimio: use comedi provided range_bipolar10

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

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/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index bc83df53872e..634d02303aa0 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -157,11 +157,6 @@ static const struct comedi_lrange range_ni_M_625x_ao = { 3, {
 							     }
 };
 
-static const struct comedi_lrange range_ni_M_622x_ao = { 1, {
-							     RANGE(-10, 10),
-							     }
-};
-
 enum ni_pcimio_boardid {
 	BOARD_PCIMIO_16XE_50,
 	BOARD_PCIMIO_16XE_10,
@@ -760,7 +755,7 @@ static const struct ni_board_struct ni_boards[] = {
 		.n_aochan	= 2,
 		.aobits		= 16,
 		.ao_fifo_depth	= 8191,
-		.ao_range_table	= &range_ni_M_622x_ao,
+		.ao_range_table	= &range_bipolar10,
 		.reg_type	= ni_reg_622x,
 		.ao_speed	= 1200,
 		.num_p0_dio_channels = 8,
@@ -776,7 +771,7 @@ static const struct ni_board_struct ni_boards[] = {
 		.n_aochan	= 2,
 		.aobits		= 16,
 		.ao_fifo_depth	= 8191,
-		.ao_range_table	= &range_ni_M_622x_ao,
+		.ao_range_table	= &range_bipolar10,
 		.reg_type	= ni_reg_622x,
 		.ao_speed	= 1200,
 		.num_p0_dio_channels = 8,
@@ -814,7 +809,7 @@ static const struct ni_board_struct ni_boards[] = {
 		.n_aochan	= 2,
 		.aobits		= 16,
 		.ao_fifo_depth	= 8191,
-		.ao_range_table	= &range_ni_M_622x_ao,
+		.ao_range_table	= &range_bipolar10,
 		.reg_type	= ni_reg_622x,
 		.ao_speed	= 1200,
 		.num_p0_dio_channels = 32,
@@ -830,7 +825,7 @@ static const struct ni_board_struct ni_boards[] = {
 		.n_aochan	= 2,
 		.aobits		= 16,
 		.ao_fifo_depth	= 8191,
-		.ao_range_table	= &range_ni_M_622x_ao,
+		.ao_range_table	= &range_bipolar10,
 		.reg_type	= ni_reg_622x,
 		.ao_speed	= 1200,
 		.num_p0_dio_channels = 32,
@@ -846,7 +841,7 @@ static const struct ni_board_struct ni_boards[] = {
 		.n_aochan	= 4,
 		.aobits		= 16,
 		.ao_fifo_depth	= 8191,
-		.ao_range_table	= &range_ni_M_622x_ao,
+		.ao_range_table	= &range_bipolar10,
 		.reg_type	= ni_reg_622x,
 		.ao_speed	= 1200,
 		.num_p0_dio_channels = 32,