leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: cb_pcidas64.c: Fix checkpatch warning

Browse Source 
Fix checkpatch.pl warning:
Block comments use * on subsequent lines
Block comments use a trailing */ on a separate line

Signed-off-by: Anson Jacob <ansonjacob.aj@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Anson Jacob 2016-08-26 19:12:52 -04:00 committed by Greg Kroah-Hartman
parent 7bba53e9c2
commit 28fec2e65f
1 changed files with 77 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
drivers/staging/comedi/drivers/cb_pcidas64.c
View File

@ -1,33 +1,33 @@
/* /*
comedi/drivers/cb_pcidas64.c * comedi/drivers/cb_pcidas64.c
This is a driver for the ComputerBoards/MeasurementComputing PCI-DAS * This is a driver for the ComputerBoards/MeasurementComputing PCI-DAS
64xx, 60xx, and 4020 cards. * 64xx, 60xx, and 4020 cards.
*
Author: Frank Mori Hess <fmhess@users.sourceforge.net> * Author: Frank Mori Hess <fmhess@users.sourceforge.net>
Copyright (C) 2001, 2002 Frank Mori Hess * Copyright (C) 2001, 2002 Frank Mori Hess
*
Thanks also go to the following people: * Thanks also go to the following people:
*
Steve Rosenbluth, for providing the source code for * Steve Rosenbluth, for providing the source code for
his pci-das6402 driver, and source code for working QNX pci-6402 * his pci-das6402 driver, and source code for working QNX pci-6402
drivers by Greg Laird and Mariusz Bogacz. None of the code was * drivers by Greg Laird and Mariusz Bogacz. None of the code was
used directly here, but it was useful as an additional source of * used directly here, but it was useful as an additional source of
documentation on how to program the boards. * documentation on how to program the boards.
*
John Sims, for much testing and feedback on pcidas-4020 support. * John Sims, for much testing and feedback on pcidas-4020 support.
*
COMEDI - Linux Control and Measurement Device Interface * COMEDI - Linux Control and Measurement Device Interface
Copyright (C) 1997-8 David A. Schleef <ds@schleef.org> * Copyright (C) 1997-8 David A. Schleef <ds@schleef.org>
*
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.
*/ */
/* /*
@ -66,18 +66,17 @@
*/ */
/* /*
* TODO:
TODO: * make it return error if user attempts an ai command that uses the
make it return error if user attempts an ai command that uses the * external queue, and an ao command simultaneously user counter subdevice
external queue, and an ao command simultaneously user counter subdevice * there are a number of boards this driver will support when they are
there are a number of boards this driver will support when they are * fully released, but does not yet since the pci device id numbers
fully released, but does not yet since the pci device id numbers * are not yet available.
are not yet available. *
* support prescaled 100khz clock for slow pacing (not available on 6000
support prescaled 100khz clock for slow pacing (not available on 6000 * series?)
series?) *
* make ao fifo size adjustable like ai fifo
make ao fifo size adjustable like ai fifo
*/ */
#include <linux/module.h> #include <linux/module.h>
@ -90,8 +89,10 @@ TODO:
#include "plx9080.h" #include "plx9080.h"
#define TIMER_BASE 25 /* 40MHz master clock */ #define TIMER_BASE 25 /* 40MHz master clock */
/* 100kHz 'prescaled' clock for slow acquisition, /*
* maybe I'll support this someday */ * 100kHz 'prescaled' clock for slow acquisition,
* maybe I'll support this someday
*/
#define PRESCALED_TIMER_BASE 10000 #define PRESCALED_TIMER_BASE 10000
#define DMA_BUFFER_SIZE 0x1000 #define DMA_BUFFER_SIZE 0x1000
@ -216,7 +217,8 @@ enum hw_config_contents {
/* use 225 nanosec strobe when loading dac instead of 50 nanosec */ /* use 225 nanosec strobe when loading dac instead of 50 nanosec */
SLOW_DAC_BIT = 0x400, SLOW_DAC_BIT = 0x400,
/* bit with unknown function yet given as default value in pci-das64 /* bit with unknown function yet given as default value in pci-das64
* manual */ * manual
*/
HW_CONFIG_DUMMY_BITS = 0x2000, HW_CONFIG_DUMMY_BITS = 0x2000,
/* bit selects channels 1/0 for analog input/output, otherwise 0/1 */ /* bit selects channels 1/0 for analog input/output, otherwise 0/1 */
DMA_CH_SELECT_BIT = 0x8000, DMA_CH_SELECT_BIT = 0x8000,
@ -1138,12 +1140,14 @@ struct pcidas64_private {
/* physical addresses of ai dma buffers */ /* physical addresses of ai dma buffers */
dma_addr_t ai_buffer_bus_addr[MAX_AI_DMA_RING_COUNT]; dma_addr_t ai_buffer_bus_addr[MAX_AI_DMA_RING_COUNT];
/* array of ai dma descriptors read by plx9080, /* array of ai dma descriptors read by plx9080,
* allocated to get proper alignment */ * allocated to get proper alignment
*/
struct plx_dma_desc *ai_dma_desc; struct plx_dma_desc *ai_dma_desc;
/* physical address of ai dma descriptor array */ /* physical address of ai dma descriptor array */
dma_addr_t ai_dma_desc_bus_addr; dma_addr_t ai_dma_desc_bus_addr;
/* index of the ai dma descriptor/buffer /* index of the ai dma descriptor/buffer
* that is currently being used */ * that is currently being used
*/
unsigned int ai_dma_index; unsigned int ai_dma_index;
/* dma buffers for analog output */ /* dma buffers for analog output */
uint16_t *ao_buffer[AO_DMA_RING_COUNT]; uint16_t *ao_buffer[AO_DMA_RING_COUNT];
@ -1314,10 +1318,12 @@ static void init_plx9080(struct comedi_device *dev)
/* enable dma chaining */ /* enable dma chaining */
bits |= PLX_DMAMODE_CHAINEN; bits |= PLX_DMAMODE_CHAINEN;
/* enable interrupt on dma done /* enable interrupt on dma done
* (probably don't need this, since chain never finishes) */ * (probably don't need this, since chain never finishes)
*/
bits |= PLX_DMAMODE_DONEIEN; bits |= PLX_DMAMODE_DONEIEN;
/* don't increment local address during transfers /* don't increment local address during transfers
* (we are transferring from a fixed fifo register) */ * (we are transferring from a fixed fifo register)
*/
bits |= PLX_DMAMODE_LACONST; bits |= PLX_DMAMODE_LACONST;
/* route dma interrupt to pci bus */ /* route dma interrupt to pci bus */
bits |= PLX_DMAMODE_INTRPCI; bits |= PLX_DMAMODE_INTRPCI;