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

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

staging: comedi: ni_mio_common: remove BUG_ON(gpct_index ...) checks 



The gpct_index will always be 0 or 1. Remove the unnecessary BUG_ON()
checks.

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 25e941af

drivers/staging/comedi/drivers/ni_mio_common.c

+0 −2
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev, 
	unsigned long flags;

	struct mite_channel *mite_chan;



	BUG_ON(gpct_index >= NUM_GPCT);

	spin_lock_irqsave(&devpriv->mite_channel_lock, flags);

	BUG_ON(devpriv->counter_dev->counters[gpct_index].mite_chan);

	mite_chan =
@@ -770,7 +769,6 @@ static void ni_release_gpct_mite_channel(struct comedi_device *dev, 
	struct ni_private *devpriv = dev->private;

	unsigned long flags;



	BUG_ON(gpct_index >= NUM_GPCT);

	spin_lock_irqsave(&devpriv->mite_channel_lock, flags);

	if (devpriv->counter_dev->counters[gpct_index].mite_chan) {

		struct mite_channel *mite_chan =

drivers/staging/comedi/drivers/ni_stc.h

+0 −2
Original line number Diff line number Diff line
@@ -605,14 +605,12 @@ static inline unsigned ni_stc_dma_channel_select_bitfield(unsigned channel) 
static inline unsigned GPCT_DMA_Select_Bits(unsigned gpct_index,

					    unsigned mite_channel)

{

	BUG_ON(gpct_index > 1);

	return ni_stc_dma_channel_select_bitfield(mite_channel) << (4 *

								    gpct_index);

}



static inline unsigned GPCT_DMA_Select_Mask(unsigned gpct_index)

{

	BUG_ON(gpct_index > 1);

	return 0xf << (4 * gpct_index);

}