From: H Hartley Sweeten Date: Fri, 1 May 2015 22:00:02 +0000 (-0700) Subject: staging: comedi: ni_mio_common: remove BUG_ON(gpct_index ...) checks X-Git-Tag: v4.2-rc1~88^2~664 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3446b08e83eb152fe97c791d16cbc68523a62bce;p=karo-tx-linux.git 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: 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 4a94bc3986ef..2e1fde3d843d 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -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 = diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 23cc4902b905..9ce4c5639923 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -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); }