Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: ni_mio_common: move ni_stc_dma_channel_select_bitfield() 



Move this inline helper function from ni_stc.h. It does not need to be
exposed outside of this file.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d6f3aae

drivers/staging/comedi/drivers/ni_mio_common.c

+11 −0
Original line number Diff line number Diff line
@@ -567,6 +567,17 @@ static inline void ni_set_bitfield(struct comedi_device *dev, int reg, 


#ifdef PCIDMA

/* DMA channel setup */

static inline unsigned ni_stc_dma_channel_select_bitfield(unsigned channel)

{

	if (channel < 4)

		return 1 << channel;

	if (channel == 4)

		return 0x3;

	if (channel == 5)

		return 0x5;

	BUG();

	return 0;

}



/* negative channel means no channel */

static inline void ni_set_ai_dma_channel(struct comedi_device *dev, int channel)

drivers/staging/comedi/drivers/ni_stc.h

+0 −12
Original line number Diff line number Diff line
@@ -592,18 +592,6 @@ 
#define NI_E_MISC_CMD_EXT_ATRIG		NI_E_MISC_CMD_INTEXT_ATRIG(0)

#define NI_E_MISC_CMD_INT_ATRIG		NI_E_MISC_CMD_INTEXT_ATRIG(1)



static inline unsigned ni_stc_dma_channel_select_bitfield(unsigned channel)

{

	if (channel < 4)

		return 1 << channel;

	if (channel == 4)

		return 0x3;

	if (channel == 5)

		return 0x5;

	BUG();

	return 0;

}



#define NI_E_AI_CFG_LO_REG		0x10	/* w16 */

#define NI_E_AI_CFG_LO_LAST_CHAN	BIT(15)

#define NI_E_AI_CFG_LO_GEN_TRIG		BIT(12)