p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: comedi: ni_tiocmd: fix block comments 

Fix the checkpatch.pl issues:
WARNING: Block comments use * on subsequent lines

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>
This commit is contained in:
H Hartley Sweeten 2016-03-23 15:36:57 -07:00 committed by Greg Kroah-Hartman
parent 9f62bee520
commit b878a82ee1
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/staging/comedi/drivers/ni_tiocmd.c
View File

@ -1,19 +1,18 @@
/* /*
comedi/drivers/ni_tiocmd.c * Command support for NI general purpose counters
Command support for NI general purpose counters *
* Copyright (C) 2006 Frank Mori Hess <fmhess@users.sourceforge.net>
Copyright (C) 2006 Frank Mori Hess <fmhess@users.sourceforge.net> *
* This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
the Free Software Foundation; either version 2 of the License, or * (at your option) any later version.
(at your option) any later version. *
* This program is distributed in the hope that it will be useful,
This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details.
GNU General Public License for more details. */
*/
/* /*
* Module: ni_tiocmd * Module: ni_tiocmd
@ -36,13 +35,10 @@
* DAQ 660x Register-Level Programmer Manual (NI 370505A-01) * DAQ 660x Register-Level Programmer Manual (NI 370505A-01)
* DAQ 6601/6602 User Manual (NI 322137B-01) * DAQ 6601/6602 User Manual (NI 322137B-01)
* 340934b.pdf DAQ-STC reference manual * 340934b.pdf DAQ-STC reference manual
*
* TODO: Support use of both banks X and Y
*/ */
/*
TODO:
Support use of both banks X and Y
*/
#include <linux/module.h> #include <linux/module.h>
#include "ni_tio_internal.h" #include "ni_tio_internal.h"
#include "mite.h" #include "mite.h"
@ -305,9 +301,6 @@ int ni_tio_cancel(struct ni_gpct *counter)
} }
EXPORT_SYMBOL_GPL(ni_tio_cancel); EXPORT_SYMBOL_GPL(ni_tio_cancel);
/* During buffered input counter operation for e-series, the gate
interrupt is acked automatically by the dma controller, due to the
Gi_Read/Write_Acknowledges_IRQ bits in the input select register. */
static int should_ack_gate(struct ni_gpct *counter) static int should_ack_gate(struct ni_gpct *counter)
{ {
unsigned long flags; unsigned long flags;
@ -315,12 +308,19 @@ static int should_ack_gate(struct ni_gpct *counter)
switch (counter->counter_dev->variant) { switch (counter->counter_dev->variant) {
case ni_gpct_variant_m_series: case ni_gpct_variant_m_series:
/* not sure if 660x really supports gate
interrupts (the bits are not listed
in register-level manual) */
case ni_gpct_variant_660x: case ni_gpct_variant_660x:
/*
* not sure if 660x really supports gate interrupts
* (the bits are not listed in register-level manual)
*/
return 1; return 1;
case ni_gpct_variant_e_series: case ni_gpct_variant_e_series:
/*
* During buffered input counter operation for e-series,
* the gate interrupt is acked automatically by the dma
* controller, due to the Gi_Read/Write_Acknowledges_IRQ
* bits in the input select register.
*/
spin_lock_irqsave(&counter->lock, flags); spin_lock_irqsave(&counter->lock, flags);
{ {
if (!counter->mite_chan || if (!counter->mite_chan ||
@ -360,9 +360,11 @@ static void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter,
if (gxx_status & GI_GATE_ERROR(cidx)) { if (gxx_status & GI_GATE_ERROR(cidx)) {
ack |= GI_GATE_ERROR_CONFIRM(cidx); ack |= GI_GATE_ERROR_CONFIRM(cidx);
if (gate_error) { if (gate_error) {
/*660x don't support automatic acknowledgment /*
of gate interrupt via dma read/write * 660x don't support automatic acknowledgment
and report bogus gate errors */ * of gate interrupt via dma read/write
* and report bogus gate errors
*/
if (counter->counter_dev->variant != if (counter->counter_dev->variant !=
ni_gpct_variant_660x) ni_gpct_variant_660x)
*gate_error = 1; *gate_error = 1;