aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-22 21:33:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-23 13:41:38 -0400
commitb678075f9a9bad493ddb6dda833c9f334bf2dc1d (patch)
tree43cf13c7f6c3b204ed476692d3695d516cdbcc4e
parent0a8fc08910cfec7713801b7097e9a31c960339b8 (diff)
staging: comedi: das800: cleanup range table declarations
Use the BIP_RANGE and UNI_RANGE macros to define the range tables instead of the more generic RANGE macro. Tidy up the whitespace of the tables. 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>
-rw-r--r--drivers/staging/comedi/drivers/das800.c90
1 files changed, 43 insertions, 47 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index bc8a23e8a5d7..a71a290739cc 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -115,62 +115,58 @@ struct das800_board {
115}; 115};
116 116
117static const struct comedi_lrange range_das801_ai = { 117static const struct comedi_lrange range_das801_ai = {
118 9, 118 9, {
119 { 119 BIP_RANGE(5),
120 RANGE(-5, 5), 120 BIP_RANGE(10),
121 RANGE(-10, 10), 121 UNI_RANGE(10),
122 RANGE(0, 10), 122 BIP_RANGE(0.5),
123 RANGE(-0.5, 0.5), 123 UNI_RANGE(1),
124 RANGE(0, 1), 124 BIP_RANGE(0.05),
125 RANGE(-0.05, 0.05), 125 UNI_RANGE(0.1),
126 RANGE(0, 0.1), 126 BIP_RANGE(0.01),
127 RANGE(-0.01, 0.01), 127 UNI_RANGE(0.02)
128 RANGE(0, 0.02), 128 }
129 }
130}; 129};
131 130
132static const struct comedi_lrange range_cio_das801_ai = { 131static const struct comedi_lrange range_cio_das801_ai = {
133 9, 132 9, {
134 { 133 BIP_RANGE(5),
135 RANGE(-5, 5), 134 BIP_RANGE(10),
136 RANGE(-10, 10), 135 UNI_RANGE(10),
137 RANGE(0, 10), 136 BIP_RANGE(0.5),
138 RANGE(-0.5, 0.5), 137 UNI_RANGE(1),
139 RANGE(0, 1), 138 BIP_RANGE(0.05),
140 RANGE(-0.05, 0.05), 139 UNI_RANGE(0.1),
141 RANGE(0, 0.1), 140 BIP_RANGE(0.005),
142 RANGE(-0.005, 0.005), 141 UNI_RANGE(0.01)
143 RANGE(0, 0.01), 142 }
144 }
145}; 143};
146 144
147static const struct comedi_lrange range_das802_ai = { 145static const struct comedi_lrange range_das802_ai = {
148 9, 146 9, {
149 { 147 BIP_RANGE(5),
150 RANGE(-5, 5), 148 BIP_RANGE(10),
151 RANGE(-10, 10), 149 UNI_RANGE(10),
152 RANGE(0, 10), 150 BIP_RANGE(2.5),
153 RANGE(-2.5, 2.5), 151 UNI_RANGE(5),
154 RANGE(0, 5), 152 BIP_RANGE(1.25),
155 RANGE(-1.25, 1.25), 153 UNI_RANGE(2.5),
156 RANGE(0, 2.5), 154 BIP_RANGE(0.625),
157 RANGE(-0.625, 0.625), 155 UNI_RANGE(1.25)
158 RANGE(0, 1.25), 156 }
159 }
160}; 157};
161 158
162static const struct comedi_lrange range_das80216_ai = { 159static const struct comedi_lrange range_das80216_ai = {
163 8, 160 8, {
164 { 161 BIP_RANGE(10),
165 RANGE(-10, 10), 162 UNI_RANGE(10),
166 RANGE(0, 10), 163 BIP_RANGE(5),
167 RANGE(-5, 5), 164 UNI_RANGE(5),
168 RANGE(0, 5), 165 BIP_RANGE(2.5),
169 RANGE(-2.5, 2.5), 166 UNI_RANGE(2.5),
170 RANGE(0, 2.5), 167 BIP_RANGE(1.25),
171 RANGE(-1.25, 1.25), 168 UNI_RANGE(1.25)
172 RANGE(0, 1.25), 169 }
173 }
174}; 170};
175 171
176enum { das800, ciodas800, das801, ciodas801, das802, ciodas802, ciodas80216 }; 172enum { das800, ciodas800, das801, ciodas801, das802, ciodas802, ciodas80216 };