提交 f2e92ee1 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: das16: absorb das1600_mode_detect() into caller

This function is only called during the board attach to determine the
pacer clock speed for the boards capable of bursting.

Absorb it into the caller and remove the attach noise.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: NIan Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 ccb26aa7
......@@ -984,24 +984,6 @@ static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it)
return 0;
}
static int das1600_mode_detect(struct comedi_device *dev)
{
struct das16_private_struct *devpriv = dev->private;
int status = 0;
status = inb(dev->iobase + DAS1600_STATUS_REG);
if (status & DAS1600_STATUS_CLK_10MHZ) {
devpriv->clockbase = 100;
printk(KERN_INFO " 10MHz pacer clock\n");
} else {
devpriv->clockbase = 1000;
printk(KERN_INFO " 1MHz pacer clock\n");
}
return 0;
}
static void das16_reset(struct comedi_device *dev)
{
outb(0, dev->iobase + DAS16_STATUS_REG);
......@@ -1058,7 +1040,12 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* get master clock speed */
if (devpriv->can_burst) {
das1600_mode_detect(dev);
status = inb(dev->iobase + DAS1600_STATUS_REG);
if (status & DAS1600_STATUS_CLK_10MHZ)
devpriv->clockbase = 100;
else
devpriv->clockbase = 1000;
} else {
if (it->options[3])
devpriv->clockbase = 1000 / it->options[3];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册