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

Commit ff157abe 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_ABZ_Reg() 



The "ABZ" 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 8cd3936e

drivers/staging/comedi/drivers/ni_tio.c

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ static int ni_tio_set_other_src(struct ni_gpct *counter, unsigned index, 
	if (counter_dev->variant == ni_gpct_variant_m_series) {

		unsigned int abz_reg, shift, mask;



		abz_reg = NITIO_Gi_ABZ_Reg(counter->counter_index);

		abz_reg = NITIO_ABZ_REG(counter->counter_index);

		switch (index) {

		case NI_GPCT_SOURCE_ENCODER_A:

			shift = 10;

drivers/staging/comedi/drivers/ni_tio_internal.h

+1 −11
Original line number Diff line number Diff line
@@ -36,17 +36,7 @@ 
#define NITIO_STATUS2_REG(x)		(NITIO_G01_STATUS2 + ((x) / 2))

#define NITIO_DMA_CFG_REG(x)		(NITIO_G0_DMA_CFG + (x))

#define NITIO_DMA_STATUS_REG(x)		(NITIO_G0_DMA_STATUS + (x))



static inline enum ni_gpct_register NITIO_Gi_ABZ_Reg(unsigned idx)

{

	switch (idx) {

	case 0:

		return NITIO_G0_ABZ;

	case 1:

		return NITIO_G1_ABZ;

	}

	return 0;

}

#define NITIO_ABZ_REG(x)		(NITIO_G0_ABZ + (x))



static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(unsigned idx)

{