Commit 576a09f0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adv_pci1710: remove 'i8254_osc_base' from private data

This member of the private data is always set to I8254_OSC_BASE_10MHZ. Remove
it from the private data and just open code the value.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16c7eb60
...@@ -298,7 +298,6 @@ static const struct boardtype boardtypes[] = { ...@@ -298,7 +298,6 @@ static const struct boardtype boardtypes[] = {
struct pci1710_private { struct pci1710_private {
unsigned int CntrlReg; /* Control register */ unsigned int CntrlReg; /* Control register */
unsigned int i8254_osc_base; /* frequence of onboard oscilator */
unsigned int ai_act_scan; /* how many scans we finished */ unsigned int ai_act_scan; /* how many scans we finished */
unsigned int ai_act_chan; /* actual position in actual scan */ unsigned int ai_act_chan; /* actual position in actual scan */
unsigned char ai_et; unsigned char ai_et;
...@@ -1022,7 +1021,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, ...@@ -1022,7 +1021,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
tmp = cmd->convert_arg; tmp = cmd->convert_arg;
i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
&devpriv->next_divisor1, &devpriv->next_divisor1,
&devpriv->next_divisor2, &devpriv->next_divisor2,
&cmd->convert_arg, cmd->flags); &cmd->convert_arg, cmd->flags);
...@@ -1183,7 +1182,6 @@ static int pci1710_auto_attach(struct comedi_device *dev, ...@@ -1183,7 +1182,6 @@ static int pci1710_auto_attach(struct comedi_device *dev,
s->do_cmd = pci171x_ai_cmd; s->do_cmd = pci171x_ai_cmd;
s->cancel = pci171x_ai_cancel; s->cancel = pci171x_ai_cancel;
} }
devpriv->i8254_osc_base = I8254_OSC_BASE_10MHZ;
subdev++; subdev++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment