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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 4a94bc3986eff1ab7da0832a4294cdbf5c3f72a3..2e1fde3d843d86a347e3582474b93c19eab67920 100644 (file)
--- 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 23cc4902b9056e3acf8e730100ba2e610c137e81..9ce4c5639923ce1275512bb731ca570210a6c9bb 100644 (file)
--- 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);
 }