diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-04-29 11:08:42 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-03 20:02:43 -0400 |
| commit | 576a09f01bea680e46df033634541f33a70640cf (patch) | |
| tree | b9aa7d0d677156a1468302c5086aaee28e43403f | |
| parent | 16c7eb6047bb0261124dfc4b5e63873a9ca5c442 (diff) | |
| download | linux-576a09f01bea680e46df033634541f33a70640cf.tar.gz linux-576a09f01bea680e46df033634541f33a70640cf.tar.bz2 linux-576a09f01bea680e46df033634541f33a70640cf.zip | |
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: 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/adv_pci1710.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 174f9de3b638..3060b951e9cd 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -298,7 +298,6 @@ static const struct boardtype boardtypes[] = { struct pci1710_private { 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_chan; /* actual position in actual scan */ unsigned char ai_et; @@ -1022,7 +1021,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, if (cmd->convert_src == TRIG_TIMER) { 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_divisor2, &cmd->convert_arg, cmd->flags); @@ -1183,7 +1182,6 @@ static int pci1710_auto_attach(struct comedi_device *dev, s->do_cmd = pci171x_ai_cmd; s->cancel = pci171x_ai_cancel; } - devpriv->i8254_osc_base = I8254_OSC_BASE_10MHZ; subdev++; } |