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

Commit fc31c52f 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_Gxx_Joint_Reset_Reg() 



The shared "Reset" 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 96b6175a

drivers/staging/comedi/drivers/ni_tio.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static int ni_tio_second_gate_registers_present(const struct ni_gpct_device 
static void ni_tio_reset_count_and_disarm(struct ni_gpct *counter)

{

	write_register(counter, Gi_Reset_Bit(counter->counter_index),

		       NITIO_Gxx_Joint_Reset_Reg(counter->counter_index));

		       NITIO_RESET_REG(counter->counter_index));

}



void ni_tio_init_counter(struct ni_gpct *counter)

drivers/staging/comedi/drivers/ni_tio_internal.h

+1 −13
Original line number Diff line number Diff line
@@ -31,19 +31,7 @@ 
#define NITIO_CNT_MODE_REG(x)		(NITIO_G0_CNT_MODE + (x))

#define NITIO_GATE2_REG(x)		(NITIO_G0_GATE2 + (x))

#define NITIO_STATUS_REG(x)		(NITIO_G01_STATUS + ((x) / 2))



static inline enum ni_gpct_register NITIO_Gxx_Joint_Reset_Reg(unsigned idx)

{

	switch (idx) {

	case 0:

	case 1:

		return NITIO_G01_RESET;

	case 2:

	case 3:

		return NITIO_G23_RESET;

	}

	return 0;

}

#define NITIO_RESET_REG(x)		(NITIO_G01_RESET + ((x) / 2))



static inline enum ni_gpct_register NITIO_Gxx_Joint_Status1_Reg(unsigned idx)

{