diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-22 21:35:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 13:41:51 -0400 |
commit | 57d1ebf795a3cdde46ee30e4ad77b4ae02fa1569 (patch) | |
tree | 2b78093d761fd52b3772994945de45c3c08133b2 | |
parent | d7427345e8364a0fc96dd6c6be3fd6235d6eb17a (diff) |
staging: comedi: das800: rename {enable,disable}_das800
For aesthetic reasons, rename these functions to match the namespace
of the rest of the driver. Also, remove the unnecessary comments.
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/das800.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index 7518d912bbf5..642eae46a4ee 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c | |||
@@ -253,8 +253,7 @@ static unsigned das800_ind_read(struct comedi_device *dev, unsigned reg) | |||
253 | return inb(dev->iobase + 7); | 253 | return inb(dev->iobase + 7); |
254 | } | 254 | } |
255 | 255 | ||
256 | /* enable_das800 makes the card start taking hardware triggered conversions */ | 256 | static void das800_enable(struct comedi_device *dev) |
257 | static void enable_das800(struct comedi_device *dev) | ||
258 | { | 257 | { |
259 | const struct das800_board *thisboard = comedi_board(dev); | 258 | const struct das800_board *thisboard = comedi_board(dev); |
260 | struct das800_private *devpriv = dev->private; | 259 | struct das800_private *devpriv = dev->private; |
@@ -271,8 +270,7 @@ static void enable_das800(struct comedi_device *dev) | |||
271 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); | 270 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); |
272 | } | 271 | } |
273 | 272 | ||
274 | /* disable_das800 stops hardware triggered conversions */ | 273 | static void das800_disable(struct comedi_device *dev) |
275 | static void disable_das800(struct comedi_device *dev) | ||
276 | { | 274 | { |
277 | unsigned long irq_flags; | 275 | unsigned long irq_flags; |
278 | 276 | ||
@@ -303,7 +301,7 @@ static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s) | |||
303 | 301 | ||
304 | devpriv->forever = 0; | 302 | devpriv->forever = 0; |
305 | devpriv->count = 0; | 303 | devpriv->count = 0; |
306 | disable_das800(dev); | 304 | das800_disable(dev); |
307 | return 0; | 305 | return 0; |
308 | } | 306 | } |
309 | 307 | ||
@@ -412,7 +410,7 @@ static int das800_ai_do_cmd(struct comedi_device *dev, | |||
412 | unsigned long irq_flags; | 410 | unsigned long irq_flags; |
413 | struct comedi_async *async = s->async; | 411 | struct comedi_async *async = s->async; |
414 | 412 | ||
415 | disable_das800(dev); | 413 | das800_disable(dev); |
416 | 414 | ||
417 | /* set channel scan limits */ | 415 | /* set channel scan limits */ |
418 | startChan = CR_CHAN(async->cmd.chanlist[0]); | 416 | startChan = CR_CHAN(async->cmd.chanlist[0]); |
@@ -476,7 +474,7 @@ static int das800_ai_do_cmd(struct comedi_device *dev, | |||
476 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); | 474 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); |
477 | 475 | ||
478 | async->events = 0; | 476 | async->events = 0; |
479 | enable_das800(dev); | 477 | das800_enable(dev); |
480 | return 0; | 478 | return 0; |
481 | } | 479 | } |
482 | 480 | ||
@@ -569,7 +567,7 @@ static irqreturn_t das800_interrupt(int irq, void *d) | |||
569 | /* otherwise, stop taking data */ | 567 | /* otherwise, stop taking data */ |
570 | } else { | 568 | } else { |
571 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); | 569 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); |
572 | disable_das800(dev); /* disable hardware triggered conversions */ | 570 | das800_disable(dev); |
573 | async->events |= COMEDI_CB_EOA; | 571 | async->events |= COMEDI_CB_EOA; |
574 | } | 572 | } |
575 | comedi_event(dev, s); | 573 | comedi_event(dev, s); |
@@ -591,7 +589,7 @@ static int das800_ai_insn_read(struct comedi_device *dev, | |||
591 | int timeout = 1000; | 589 | int timeout = 1000; |
592 | unsigned long irq_flags; | 590 | unsigned long irq_flags; |
593 | 591 | ||
594 | disable_das800(dev); /* disable hardware conversions (enables software conversions) */ | 592 | das800_disable(dev); |
595 | 593 | ||
596 | /* set multiplexer */ | 594 | /* set multiplexer */ |
597 | chan = CR_CHAN(insn->chanspec); | 595 | chan = CR_CHAN(insn->chanspec); |
@@ -788,7 +786,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
788 | s->range_table = &range_digital; | 786 | s->range_table = &range_digital; |
789 | s->insn_bits = das800_do_insn_bits; | 787 | s->insn_bits = das800_do_insn_bits; |
790 | 788 | ||
791 | disable_das800(dev); | 789 | das800_disable(dev); |
792 | 790 | ||
793 | /* initialize digital out channels */ | 791 | /* initialize digital out channels */ |
794 | spin_lock_irqsave(&dev->spinlock, irq_flags); | 792 | spin_lock_irqsave(&dev->spinlock, irq_flags); |