staging: comedi: ni_mio_common: convert NI_GPCT_SUBDEV to a macro

The 'counter_index' is always in range (0 to < NUM_GPCT, which is 2).

For aesthetics, convert this inline function into a macro and remove
the BUG() which can never occur.

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 c56a5187ed7fedc8e4ef6c6a0690a43ca8d2101c..8c2c4f697587f6d0762f7ee40a77b5db99a34f46 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -214,19 +214,7 @@ enum ni_common_subdevices {
        NI_NUM_SUBDEVICES
 };
 
-static inline unsigned int NI_GPCT_SUBDEV(unsigned int counter_index)
-{
-       switch (counter_index) {
-       case 0:
-               return NI_GPCT0_SUBDEV;
-       case 1:
-               return NI_GPCT1_SUBDEV;
-       default:
-               break;
-       }
-       BUG();
-       return NI_GPCT0_SUBDEV;
-}
+#define NI_GPCT_SUBDEV(x)      (NI_GPCT0_SUBDEV + (x))
 
 enum timebase_nanoseconds {
        TIMEBASE_1_NS = 50,