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

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

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: 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 0c26c7ed

drivers/staging/comedi/drivers/ni_660x.c

+2 −8
Original line number Diff line number Diff line
@@ -347,11 +347,6 @@ static inline unsigned dma_select_mask(unsigned dma_channel) 
enum dma_selection {

	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)

{
@@ -676,8 +671,7 @@ static inline void ni_660x_set_dma_channel(struct comedi_device *dev, 
	devpriv->dma_configuration_soft_copies[chip] &=

		~dma_select_mask(mite_channel);

	devpriv->dma_configuration_soft_copies[chip] |=

	    dma_select_bits(mite_channel,

			    dma_selection_counter(counter->counter_index));

		dma_select_bits(mite_channel, counter->counter_index);

	ni_660x_write_register(dev, chip,

			       devpriv->dma_configuration_soft_copies[chip] |

			       dma_reset_bit(mite_channel), NI660X_DMA_CFG);