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

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

staging: comedi: ni_tio_internal: simplify ni_tio_counting_mode_registers_present() 



Only the e series gpct variant does not have counting mode registers.
Simplfy this function. For aesthetics, return bool instead of int.

This fixes the checkpatch.pl issues:
CHECK: spaces preferred around that '*' (ctx:ExV)
CHECK: Avoid crashing the kernel - try using WARN_ON & recovery code
       rather than BUG() or BUG_ON()

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 f4e0331f

drivers/staging/comedi/drivers/ni_tio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,7 @@ static void ni_tio_set_sync_mode(struct ni_gpct *counter, int force_alt_sync) 
	unsigned mode;

	unsigned mode;

	uint64_t clock_period_ps;

	uint64_t clock_period_ps;





	if (ni_tio_counting_mode_registers_present(counter_dev) == 0)

	if (!ni_tio_counting_mode_registers_present(counter_dev))

		return;

		return;





	mode = ni_tio_get_soft_copy(counter, counting_mode_reg);

	mode = ni_tio_get_soft_copy(counter, counting_mode_reg);

drivers/staging/comedi/drivers/ni_tio_internal.h

+4 −14
Original line number Original line Diff line number Diff line
@@ -174,21 +174,11 @@ static inline unsigned read_register(struct ni_gpct *counter, 
	return counter->counter_dev->read_register(counter, reg);

	return counter->counter_dev->read_register(counter, reg);

}

}





static inline int ni_tio_counting_mode_registers_present(const struct

static inline bool

							 ni_gpct_device

ni_tio_counting_mode_registers_present(const struct ni_gpct_device *counter_dev)

							 *counter_dev)

{

{

	switch (counter_dev->variant) {

	/* m series and 660x variants have counting mode registers */

	case ni_gpct_variant_e_series:

	return counter_dev->variant != ni_gpct_variant_e_series;

		return 0;

	case ni_gpct_variant_m_series:

	case ni_gpct_variant_660x:

		return 1;

	default:

		BUG();

		break;

	}

	return 0;

}

}





void ni_tio_set_bits(struct ni_gpct *, enum ni_gpct_register reg,

void ni_tio_set_bits(struct ni_gpct *, enum ni_gpct_register reg,