tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Staging: comedi: Fixed long line lengths in comedi.h
This patches fixes some of the long line lengths that checkpatch.pl was
complaining about in comedi.h
Signed-off-by: Mark Rankilor <reodge@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
authored by
Mark Rankilor
and committed by
Greg Kroah-Hartman
e012b4c4
5e220112
+17
-9
+17
-9
drivers/staging/comedi/comedi.h
+17
-9
drivers/staging/comedi/comedi.h
···
46
46
#define COMEDI_DEVCONF_AUX_DATA2_LENGTH 26
47
47
#define COMEDI_DEVCONF_AUX_DATA1_LENGTH 27
48
48
#define COMEDI_DEVCONF_AUX_DATA0_LENGTH 28
49
-
#define COMEDI_DEVCONF_AUX_DATA_HI 29 /* most significant 32 bits of pointer address (if needed) */
50
-
#define COMEDI_DEVCONF_AUX_DATA_LO 30 /* least significant 32 bits of pointer address */
49
+
/* most significant 32 bits of pointer address (if needed) */
50
+
#define COMEDI_DEVCONF_AUX_DATA_HI 29
51
+
/* least significant 32 bits of pointer address */
52
+
#define COMEDI_DEVCONF_AUX_DATA_LO 30
51
53
#define COMEDI_DEVCONF_AUX_DATA_LENGTH 31 /* total data length */
52
54
53
55
/* max length of device and driver names */
···
57
55
58
56
/* packs and unpacks a channel/range number */
59
57
60
-
#define CR_PACK(chan, rng, aref) ((((aref)&0x3)<<24) | (((rng)&0xff)<<16) | (chan))
61
-
#define CR_PACK_FLAGS(chan, range, aref, flags) (CR_PACK(chan, range, aref) | ((flags) & CR_FLAGS_MASK))
58
+
#define CR_PACK(chan, rng, aref) \
59
+
((((aref)&0x3)<<24) | (((rng)&0xff)<<16) | (chan))
60
+
#define CR_PACK_FLAGS(chan, range, aref, flags) \
61
+
(CR_PACK(chan, range, aref) | ((flags) & CR_FLAGS_MASK))
62
62
63
63
#define CR_CHAN(a) ((a)&0xffff)
64
64
#define CR_RANGE(a) (((a)>>16)&0xff)
···
129
125
/* command flags */
130
126
/* These flags are used in comedi_cmd structures */
131
127
132
-
#define CMDF_PRIORITY 0x00000008 /* try to use a real-time interrupt while performing command */
128
+
/* try to use a real-time interrupt while performing command */
129
+
#define CMDF_PRIORITY 0x00000008
133
130
134
131
#define TRIG_RT CMDF_PRIORITY /* compatibility definition */
135
132
···
247
242
INSN_CONFIG_DISARM = 32,
248
243
INSN_CONFIG_GET_COUNTER_STATUS = 33,
249
244
INSN_CONFIG_RESET = 34,
250
-
INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR = 1001, /* Use CTR as single pulsegenerator */
251
-
INSN_CONFIG_GPCT_PULSE_TRAIN_GENERATOR = 1002, /* Use CTR as pulsetraingenerator */
252
-
INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003, /* Use the counter as encoder */
245
+
/* Use CTR as single pulsegenerator */
246
+
INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR = 1001,
247
+
/* Use CTR as pulsetraingenerator */
248
+
INSN_CONFIG_GPCT_PULSE_TRAIN_GENERATOR = 1002,
249
+
/* Use the counter as encoder */
250
+
INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003,
253
251
INSN_CONFIG_SET_GATE_SRC = 2001, /* Set gate source */
254
252
INSN_CONFIG_GET_GATE_SRC = 2002, /* Get gate source */
255
253
INSN_CONFIG_SET_CLOCK_SRC = 2003, /* Set master clock source */
256
254
INSN_CONFIG_GET_CLOCK_SRC = 2004, /* Get master clock source */
257
255
INSN_CONFIG_SET_OTHER_SRC = 2005, /* Set other source */
258
-
/* INSN_CONFIG_GET_OTHER_SRC = 2006,*//* Get other source */
256
+
/* INSN_CONFIG_GET_OTHER_SRC = 2006,*//* Get other source */
259
257
INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE = 2006, /* Get size in bytes of
260
258
subdevice's on-board
261
259
fifos used during