openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_660x: remove dma_selection_counter() 

The counter->chip_index will always be < counters_per_chip due to the
initialization of the subdevices during the attach of the board.

The dma_selection_counter() helper just does a BUG_ON() check before
returning the original value. Just use the original value directly
in the caller and remove the helper function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-12-19 16:32:07 -07:00 committed by Greg Kroah-Hartman
parent 0c26c7ed76
commit d783a20e8f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/ni_660x.c
View File

@ -347,11 +347,6 @@ static inline unsigned dma_select_mask(unsigned dma_channel)
enum dma_selection { enum dma_selection {
dma_selection_none = 0x1f, dma_selection_none = 0x1f,
}; };
static inline unsigned dma_selection_counter(unsigned counter_index)
{
BUG_ON(counter_index >= counters_per_chip);
return counter_index;
}
static inline unsigned dma_select_bits(unsigned dma_channel, unsigned selection) static inline unsigned dma_select_bits(unsigned dma_channel, unsigned selection)
{ {
@ -674,10 +669,9 @@ static inline void ni_660x_set_dma_channel(struct comedi_device *dev,
spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags); spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
devpriv->dma_configuration_soft_copies[chip] &= devpriv->dma_configuration_soft_copies[chip] &=
~dma_select_mask(mite_channel); ~dma_select_mask(mite_channel);
devpriv->dma_configuration_soft_copies[chip] |= devpriv->dma_configuration_soft_copies[chip] |=
dma_select_bits(mite_channel, dma_select_bits(mite_channel, counter->counter_index);
dma_selection_counter(counter->counter_index));
ni_660x_write_register(dev, chip, ni_660x_write_register(dev, chip,
devpriv->dma_configuration_soft_copies[chip] | devpriv->dma_configuration_soft_copies[chip] |
dma_reset_bit(mite_channel), NI660X_DMA_CFG); dma_reset_bit(mite_channel), NI660X_DMA_CFG);