From: H Hartley Sweeten Date: Fri, 1 May 2015 22:00:05 +0000 (-0700) Subject: staging: comedi: ni_mio_common: move ni_stc_dma_channel_select_bitfield() X-Git-Tag: v4.2-rc1~88^2~661 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f78476b4d3939d9aa7299889f9a5066b96b2195f;p=karo-tx-linux.git 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: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index cfb5f34b4937..e2081ea314bf 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -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) diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index e181d914d3e7..dc95e6aef5a0 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -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)