aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/dt9812.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/comedi/drivers/dt9812.c')
-rw-r--r--drivers/staging/comedi/drivers/dt9812.c30
1 files changed, 4 insertions, 26 deletions
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 57b45190479..81eb5ed6ec9 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -303,26 +303,6 @@ struct slot_dt9812 {
struct comedi_dt9812 *comedi;
};
-static const struct comedi_lrange dt9812_10_ain_range = { 1, {
- BIP_RANGE(10),
- }
-};
-
-static const struct comedi_lrange dt9812_2pt5_ain_range = { 1, {
- UNI_RANGE(2.5),
- }
-};
-
-static const struct comedi_lrange dt9812_10_aout_range = { 1, {
- BIP_RANGE(10),
- }
-};
-
-static const struct comedi_lrange dt9812_2pt5_aout_range = { 1, {
- UNI_RANGE(2.5),
- }
-};
-
static struct slot_dt9812 dt9812[DT9812_NUM_SLOTS];
static inline struct usb_dt9812 *to_dt9812_dev(struct kref *d)
@@ -912,12 +892,12 @@ static int dt9812_comedi_open(struct comedi_device *dev)
switch (devpriv->slot->usb->device) {
case 0:{
s->maxdata = 4095;
- s->range_table = &dt9812_10_ain_range;
+ s->range_table = &range_bipolar10;
}
break;
case 1:{
s->maxdata = 4095;
- s->range_table = &dt9812_2pt5_ain_range;
+ s->range_table = &range_unipolar2_5;
}
break;
}
@@ -927,12 +907,12 @@ static int dt9812_comedi_open(struct comedi_device *dev)
switch (devpriv->slot->usb->device) {
case 0:{
s->maxdata = 4095;
- s->range_table = &dt9812_10_aout_range;
+ s->range_table = &range_bipolar10;
}
break;
case 1:{
s->maxdata = 4095;
- s->range_table = &dt9812_2pt5_aout_range;
+ s->range_table = &range_unipolar2_5;
}
break;
}
@@ -1032,8 +1012,6 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
int ret;
- dev->board_name = "dt9812";
-
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;