Commit 40af57a2 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: comedi.h: checkpatch.pl --strict cleanup 



Fix the checkpatch.pl --strict issues:

CHECK: Please use a blank line after function/struct/union/enum declarations

For aesthetics, convert the inline functions into simple macros.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 663dfc05

drivers/staging/comedi/comedi.h

+31 −85
Original line number Diff line number Diff line
@@ -551,21 +551,8 @@ enum i8254_mode { 
	I8254_BINARY = 0

};



static inline unsigned NI_USUAL_PFI_SELECT(unsigned pfi_channel)

{

	if (pfi_channel < 10)

		return 0x1 + pfi_channel;



	return 0xb + pfi_channel;

}



static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)

{

	if (rtsi_channel < 7)

		return 0xb + rtsi_channel;



	return 0x1b;

}

#define NI_USUAL_PFI_SELECT(x)	(((x) < 10) ? (0x1 + (x)) : (0xb + (x)))

#define NI_USUAL_RTSI_SELECT(x)	(((x) < 7) ? (0xb + (x)) : 0x1b)



/* mode bits for NI general-purpose counters, set with

 * INSN_CONFIG_SET_COUNTER_MODE */
@@ -659,20 +646,14 @@ enum ni_gpct_clock_source_bits { 
	NI_GPCT_PRESCALE_X8_CLOCK_SRC_BITS = 0x20000000,

	NI_GPCT_INVERT_CLOCK_SRC_BIT = 0x80000000

};

static inline unsigned NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(unsigned n)

{



/* NI 660x-specific */

	return 0x10 + n;

}

static inline unsigned NI_GPCT_RTSI_CLOCK_SRC_BITS(unsigned n)

{

	return 0x18 + n;

}

static inline unsigned NI_GPCT_PFI_CLOCK_SRC_BITS(unsigned n)

{

#define NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(x)	(0x10 + (x))



#define NI_GPCT_RTSI_CLOCK_SRC_BITS(x)		(0x18 + (x))



/* no pfi on NI 660x */

	return 0x20 + n;

}

#define NI_GPCT_PFI_CLOCK_SRC_BITS(x)		(0x20 + (x))



/* Possibilities for setting a gate source with

INSN_CONFIG_SET_GATE_SRC when using NI general-purpose counters.
@@ -698,22 +679,11 @@ enum ni_gpct_gate_select { 
	 * known. */

	NI_GPCT_DISABLED_GATE_SELECT = 0x8000,

};

static inline unsigned NI_GPCT_GATE_PIN_GATE_SELECT(unsigned n)

{

	return 0x102 + n;

}

static inline unsigned NI_GPCT_RTSI_GATE_SELECT(unsigned n)

{

	return NI_USUAL_RTSI_SELECT(n);

}

static inline unsigned NI_GPCT_PFI_GATE_SELECT(unsigned n)

{

	return NI_USUAL_PFI_SELECT(n);

}

static inline unsigned NI_GPCT_UP_DOWN_PIN_GATE_SELECT(unsigned n)

{

	return 0x202 + n;

}



#define NI_GPCT_GATE_PIN_GATE_SELECT(x)		(0x102 + (x))

#define NI_GPCT_RTSI_GATE_SELECT(x)		NI_USUAL_RTSI_SELECT(x)

#define NI_GPCT_PFI_GATE_SELECT(x)		NI_USUAL_PFI_SELECT(x)

#define NI_GPCT_UP_DOWN_PIN_GATE_SELECT(x)	(0x202 + (x))



/* Possibilities for setting a source with

INSN_CONFIG_SET_OTHER_SRC when using NI general-purpose counters. */
@@ -722,15 +692,14 @@ enum ni_gpct_other_index { 
	NI_GPCT_SOURCE_ENCODER_B,

	NI_GPCT_SOURCE_ENCODER_Z

};



enum ni_gpct_other_select {

	/* m-series gates */

	/* Still unknown, probably only need NI_GPCT_PFI_OTHER_SELECT */

	NI_GPCT_DISABLED_OTHER_SELECT = 0x8000,

};

static inline unsigned NI_GPCT_PFI_OTHER_SELECT(unsigned n)

{

	return NI_USUAL_PFI_SELECT(n);

}



#define NI_GPCT_PFI_OTHER_SELECT(x)	NI_USUAL_PFI_SELECT(x)



/* start sources for ni general-purpose counters for use with

INSN_CONFIG_ARM */
@@ -777,10 +746,8 @@ enum ni_mio_clock_source { 
	NI_MIO_PLL_PXI10_CLOCK = 3,

	NI_MIO_PLL_RTSI0_CLOCK = 4

};

static inline unsigned NI_MIO_PLL_RTSI_CLOCK(unsigned rtsi_channel)

{

	return NI_MIO_PLL_RTSI0_CLOCK + rtsi_channel;

}



#define NI_MIO_PLL_RTSI_CLOCK(x)	(NI_MIO_PLL_RTSI0_CLOCK + (x))



/* Signals which can be routed to an NI RTSI pin with INSN_CONFIG_SET_ROUTING.

 The numbers assigned are not arbitrary, they correspond to the bits required
@@ -798,10 +765,8 @@ enum ni_rtsi_routing { 
	NI_RTSI_OUTPUT_RTSI_OSC = 12	/* pre-m-series always have RTSI

					 * clock on line 7 */

};

static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n)

{

	return NI_RTSI_OUTPUT_RTSI_BRD_0 + n;

}



#define NI_RTSI_OUTPUT_RTSI_BRD(x)	(NI_RTSI_OUTPUT_RTSI_BRD_0 + (x))



/* Signals which can be routed to an NI PFI pin on an m-series board with

 * INSN_CONFIG_SET_ROUTING.  These numbers are also returned by
@@ -834,10 +799,8 @@ enum ni_pfi_routing { 
	NI_PFI_OUTPUT_CDI_SAMPLE = 29,

	NI_PFI_OUTPUT_CDO_UPDATE = 30

};

static inline unsigned NI_PFI_OUTPUT_RTSI(unsigned rtsi_channel)

{

	return NI_PFI_OUTPUT_RTSI0 + rtsi_channel;

}



#define NI_PFI_OUTPUT_RTSI(x)		(NI_PFI_OUTPUT_RTSI0 + (x))



/* Signals which can be routed to output on a NI PFI pin on a 660x board

 with INSN_CONFIG_SET_ROUTING.  The numbers assigned are
@@ -853,14 +816,8 @@ enum ni_660x_pfi_routing { 
/* NI External Trigger lines.  These values are not arbitrary, but are related

 * to the bits required to program the board (offset by 1 for historical

 * reasons). */

static inline unsigned NI_EXT_PFI(unsigned pfi_channel)

{

	return NI_USUAL_PFI_SELECT(pfi_channel) - 1;

}

static inline unsigned NI_EXT_RTSI(unsigned rtsi_channel)

{

	return NI_USUAL_RTSI_SELECT(rtsi_channel) - 1;

}

#define NI_EXT_PFI(x)			(NI_USUAL_PFI_SELECT(x) - 1)

#define NI_EXT_RTSI(x)			(NI_USUAL_RTSI_SELECT(x) - 1)



/* status bits for INSN_CONFIG_GET_COUNTER_STATUS */

enum comedi_counter_status_flags {
@@ -884,26 +841,15 @@ enum ni_m_series_cdio_scan_begin_src { 
	NI_CDIO_SCAN_BEGIN_SRC_FREQ_OUT = 32,

	NI_CDIO_SCAN_BEGIN_SRC_DIO_CHANGE_DETECT_IRQ = 33

};

static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel)

{

	return NI_USUAL_PFI_SELECT(pfi_channel);

}

static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel)

{

	return NI_USUAL_RTSI_SELECT(rtsi_channel);

}



#define NI_CDIO_SCAN_BEGIN_SRC_PFI(x)	NI_USUAL_PFI_SELECT(x)

#define NI_CDIO_SCAN_BEGIN_SRC_RTSI(x)	NI_USUAL_RTSI_SELECT(x)



/* scan_begin_src for scan_begin_arg==TRIG_EXT with analog output command on NI

 * boards.  These scan begin sources can also be bitwise-or'd with CR_INVERT to

 * change polarity. */

static inline unsigned NI_AO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel)

{

	return NI_USUAL_PFI_SELECT(pfi_channel);

}

static inline unsigned NI_AO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel)

{

	return NI_USUAL_RTSI_SELECT(rtsi_channel);

}

#define NI_AO_SCAN_BEGIN_SRC_PFI(x)	NI_USUAL_PFI_SELECT(x)

#define NI_AO_SCAN_BEGIN_SRC_RTSI(x)	NI_USUAL_RTSI_SELECT(x)



/* Bits for setting a clock source with

 * INSN_CONFIG_SET_CLOCK_SRC when using NI frequency output subdevice. */