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

Commit 5f19efac 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_Status2_Reg() 



The shared "Status2" 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 450a7c43

drivers/staging/comedi/drivers/ni_tio_internal.h

+1 −13
Original line number Original line Diff line number Diff line
@@ -33,19 +33,7 @@ 
#define NITIO_STATUS_REG(x)		(NITIO_G01_STATUS + ((x) / 2))

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

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

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

#define NITIO_STATUS1_REG(x)		(NITIO_G01_STATUS1 + ((x) / 2))

#define NITIO_STATUS1_REG(x)		(NITIO_G01_STATUS1 + ((x) / 2))



#define NITIO_STATUS2_REG(x)		(NITIO_G01_STATUS2 + ((x) / 2))

static inline enum ni_gpct_register NITIO_Gxx_Joint_Status2_Reg(unsigned idx)

{

	switch (idx) {

	case 0:

	case 1:

		return NITIO_G01_STATUS2;

	case 2:

	case 3:

		return NITIO_G23_STATUS2;

	}

	return 0;

}





static inline enum ni_gpct_register NITIO_Gi_DMA_Config_Reg(unsigned idx)

static inline enum ni_gpct_register NITIO_Gi_DMA_Config_Reg(unsigned idx)

{

{

drivers/staging/comedi/drivers/ni_tiocmd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -408,7 +408,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error, 
				*stale_data = 1;

				*stale_data = 1;

		}

		}

		if (read_register(counter,

		if (read_register(counter,

				  NITIO_Gxx_Joint_Status2_Reg

				  NITIO_STATUS2_REG

				  (counter->counter_index)) &

				  (counter->counter_index)) &

		    Gi_Permanent_Stale_Bit(counter->counter_index)) {

		    Gi_Permanent_Stale_Bit(counter->counter_index)) {

			dev_info(counter->counter_dev->dev->class_dev,

			dev_info(counter->counter_dev->dev->class_dev,