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

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

staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Autoincrement_Reg() 



The "AutoIncrement" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

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 12375292

drivers/staging/comedi/drivers/ni_tio.c

+3 −3
Original line number Diff line number Diff line
@@ -372,12 +372,12 @@ void ni_tio_init_counter(struct ni_gpct *counter) 


	ni_tio_reset_count_and_disarm(counter);

	/* initialize counter registers */

	counter_dev->regs[NITIO_Gi_Autoincrement_Reg(counter->counter_index)] =

	counter_dev->regs[NITIO_AUTO_INC_REG(counter->counter_index)] =

	    0x0;

	write_register(counter,

		       counter_dev->

		       regs[NITIO_Gi_Autoincrement_Reg(counter->counter_index)],

		       NITIO_Gi_Autoincrement_Reg(counter->counter_index));

		       regs[NITIO_AUTO_INC_REG(counter->counter_index)],

		       NITIO_AUTO_INC_REG(counter->counter_index));

	ni_tio_set_bits(counter, NITIO_Gi_Command_Reg(counter->counter_index),

			~0, Gi_Synchronize_Gate_Bit);

	ni_tio_set_bits(counter, NITIO_Gi_Mode_Reg(counter->counter_index), ~0,

drivers/staging/comedi/drivers/ni_tio_internal.h

+1 −14
Original line number Diff line number Diff line
@@ -21,20 +21,7 @@ 


#include "ni_tio.h"



static inline enum ni_gpct_register NITIO_Gi_Autoincrement_Reg(unsigned idx)

{

	switch (idx) {

	case 0:

		return NITIO_G0_AUTO_INC;

	case 1:

		return NITIO_G1_AUTO_INC;

	case 2:

		return NITIO_G2_AUTO_INC;

	case 3:

		return NITIO_G3_AUTO_INC;

	}

	return 0;

}

#define NITIO_AUTO_INC_REG(x)		(NITIO_G0_AUTO_INC + (x))



static inline enum ni_gpct_register NITIO_Gi_Command_Reg(unsigned idx)

{