diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-22 18:32:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 10:41:38 -0700 |
| commit | 62c3b4bf66bfff62faf4556ee5ba251ba5e8b506 (patch) | |
| tree | 7ca2b9c5efecc68642f0b0f5bb25113cdcb74489 /drivers/staging/comedi | |
| parent | 4f71ceebebe8af5a4cbedf13c88d1908a96987fc (diff) | |
staging: comedi: das800: move das800_set_frequency()
Move das800_set_frequency() to avoid the need for the forward
declaration.
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/das800.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index 630a14dd5b2..596be5e991b 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c @@ -233,7 +233,6 @@ static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s); static irqreturn_t das800_interrupt(int irq, void *d); static void enable_das800(struct comedi_device *dev); static void disable_das800(struct comedi_device *dev); -static int das800_set_frequency(struct comedi_device *dev); /* interrupt service routine */ static irqreturn_t das800_interrupt(int irq, void *d) @@ -373,6 +372,21 @@ static void disable_das800(struct comedi_device *dev) spin_unlock_irqrestore(&dev->spinlock, irq_flags); } +static int das800_set_frequency(struct comedi_device *dev) +{ + struct das800_private *devpriv = dev->private; + int err = 0; + + if (i8254_load(dev->iobase + DAS800_8254, 0, 1, devpriv->divisor1, 2)) + err++; + if (i8254_load(dev->iobase + DAS800_8254, 0, 2, devpriv->divisor2, 2)) + err++; + if (err) + return -1; + + return 0; +} + static int das800_ai_do_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) @@ -646,22 +660,6 @@ static int das800_do_wbits(struct comedi_device *dev, return insn->n; } -/* loads counters with divisor1, divisor2 from private structure */ -static int das800_set_frequency(struct comedi_device *dev) -{ - struct das800_private *devpriv = dev->private; - int err = 0; - - if (i8254_load(dev->iobase + DAS800_8254, 0, 1, devpriv->divisor1, 2)) - err++; - if (i8254_load(dev->iobase + DAS800_8254, 0, 2, devpriv->divisor2, 2)) - err++; - if (err) - return -1; - - return 0; -} - static int das800_probe(struct comedi_device *dev) { const struct das800_board *thisboard = comedi_board(dev); |