staging: comedi: adv_pci1710: remove 'i8254_osc_base' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 29 Apr 2014 18:08:42 +0000 (11:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 May 2014 00:02:43 +0000 (20:02 -0400)
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>
drivers/staging/comedi/drivers/adv_pci1710.c

index 174f9de3b6381f7ba8f3953087c7efe1b38cd4f3..3060b951e9cdbdbc2c312554591667edc7c15679 100644 (file)
@@ -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++;
        }