diff options
author | Mark Rankilor <reodge@gmail.com> | 2010-05-13 06:28:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-14 16:53:19 -0400 |
commit | 7d8e737dd7e3519110a7bc529ef6ac80ac41c3f5 (patch) | |
tree | d5b3a1fdb0ebe18fefcbef5359c8768e9d95ec1d | |
parent | b464f791caf66b6120c3cd8a77ad313ed532667a (diff) |
Staging: comedi: Fixed more long line lengths in comedi.h
This patches fixes some long line lengths in comedi.h from checkpatch.pl
Signed-off-by: Mark Rankilor <reodge@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/comedi.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 3e3663fe1f4f..6c900e2756fb 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h | |||
@@ -267,7 +267,8 @@ | |||
267 | * streaming input/output */ | 267 | * streaming input/output */ |
268 | INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE = 2006, | 268 | INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE = 2006, |
269 | INSN_CONFIG_SET_COUNTER_MODE = 4097, | 269 | INSN_CONFIG_SET_COUNTER_MODE = 4097, |
270 | INSN_CONFIG_8254_SET_MODE = INSN_CONFIG_SET_COUNTER_MODE, /* deprecated */ | 270 | /* INSN_CONFIG_8254_SET_MODE is deprecated */ |
271 | INSN_CONFIG_8254_SET_MODE = INSN_CONFIG_SET_COUNTER_MODE, | ||
271 | INSN_CONFIG_8254_READ_STATUS = 4098, | 272 | INSN_CONFIG_8254_READ_STATUS = 4098, |
272 | INSN_CONFIG_SET_ROUTING = 4099, | 273 | INSN_CONFIG_SET_ROUTING = 4099, |
273 | INSN_CONFIG_GET_ROUTING = 4109, | 274 | INSN_CONFIG_GET_ROUTING = 4109, |
@@ -598,14 +599,17 @@ | |||
598 | NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS = 0x3, | 599 | NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS = 0x3, |
599 | NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS = 0x4, | 600 | NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS = 0x4, |
600 | NI_GPCT_NEXT_TC_CLOCK_SRC_BITS = 0x5, | 601 | NI_GPCT_NEXT_TC_CLOCK_SRC_BITS = 0x5, |
601 | NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS = 0x6, /* NI 660x-specific */ | 602 | /* NI 660x-specific */ |
603 | NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS = 0x6, | ||
602 | NI_GPCT_PXI10_CLOCK_SRC_BITS = 0x7, | 604 | NI_GPCT_PXI10_CLOCK_SRC_BITS = 0x7, |
603 | NI_GPCT_PXI_STAR_TRIGGER_CLOCK_SRC_BITS = 0x8, | 605 | NI_GPCT_PXI_STAR_TRIGGER_CLOCK_SRC_BITS = 0x8, |
604 | NI_GPCT_ANALOG_TRIGGER_OUT_CLOCK_SRC_BITS = 0x9, | 606 | NI_GPCT_ANALOG_TRIGGER_OUT_CLOCK_SRC_BITS = 0x9, |
605 | NI_GPCT_PRESCALE_MODE_CLOCK_SRC_MASK = 0x30000000, | 607 | NI_GPCT_PRESCALE_MODE_CLOCK_SRC_MASK = 0x30000000, |
606 | NI_GPCT_NO_PRESCALE_CLOCK_SRC_BITS = 0x0, | 608 | NI_GPCT_NO_PRESCALE_CLOCK_SRC_BITS = 0x0, |
607 | NI_GPCT_PRESCALE_X2_CLOCK_SRC_BITS = 0x10000000, /* divide source by 2 */ | 609 | /* divide source by 2 */ |
608 | NI_GPCT_PRESCALE_X8_CLOCK_SRC_BITS = 0x20000000, /* divide source by 8 */ | 610 | NI_GPCT_PRESCALE_X2_CLOCK_SRC_BITS = 0x10000000, |
611 | /* divide source by 8 */ | ||
612 | NI_GPCT_PRESCALE_X8_CLOCK_SRC_BITS = 0x20000000, | ||
609 | NI_GPCT_INVERT_CLOCK_SRC_BIT = 0x80000000 | 613 | NI_GPCT_INVERT_CLOCK_SRC_BIT = 0x80000000 |
610 | }; | 614 | }; |
611 | static inline unsigned NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(unsigned n) | 615 | static inline unsigned NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(unsigned n) |
@@ -837,7 +841,8 @@ INSN_CONFIG_ARM */ | |||
837 | { | 841 | { |
838 | return NI_USUAL_PFI_SELECT(pfi_channel); | 842 | return NI_USUAL_PFI_SELECT(pfi_channel); |
839 | } | 843 | } |
840 | static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel) | 844 | static inline unsigned |
845 | NI_CDIO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel) | ||
841 | { | 846 | { |
842 | return NI_USUAL_RTSI_SELECT(rtsi_channel); | 847 | return NI_USUAL_RTSI_SELECT(rtsi_channel); |
843 | } | 848 | } |