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

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

staging: comedi: ni_tio: tidy up ni_tio_get_gate_src() 



Clarify the code a bit by handling the NI_GPCT_DISABLED_GATE_SELECT source
in the common code path.

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 8e621cf0

drivers/staging/comedi/drivers/ni_tio.c

+15 −17
Original line number Original line Diff line number Diff line
@@ -1192,19 +1192,22 @@ static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned int gate_index, 
{

{

	struct ni_gpct_device *counter_dev = counter->counter_dev;

	struct ni_gpct_device *counter_dev = counter->counter_dev;

	unsigned int cidx = counter->counter_index;

	unsigned int cidx = counter->counter_index;

	unsigned int mode = ni_tio_get_soft_copy(counter, NITIO_MODE_REG(cidx));

	unsigned int mode;

	unsigned int gate2_reg = NITIO_GATE2_REG(cidx);

	unsigned int reg;

	unsigned int gate;

	unsigned int gate;





	switch (gate_index) {

	mode = ni_tio_get_soft_copy(counter, NITIO_MODE_REG(cidx));

	case 0:

	if (((mode & GI_GATING_MODE_MASK) == GI_GATING_DISABLED) ||

		if ((mode & GI_GATING_MODE_MASK) == GI_GATING_DISABLED) {

	    (gate_index == 1 &&

	     !(counter_dev->regs[NITIO_GATE2_REG(cidx)] & GI_GATE2_MODE))) {

		*gate_source = NI_GPCT_DISABLED_GATE_SELECT;

		*gate_source = NI_GPCT_DISABLED_GATE_SELECT;

		return 0;

		return 0;

	}

	}





		gate = GI_BITS_TO_GATE(ni_tio_get_soft_copy(counter,

	switch (gate_index) {

						NITIO_INPUT_SEL_REG(cidx)));

	case 0:

		reg = NITIO_INPUT_SEL_REG(cidx);

		gate = GI_BITS_TO_GATE(ni_tio_get_soft_copy(counter, reg));





		switch (counter_dev->variant) {

		switch (counter_dev->variant) {

		case ni_gpct_variant_e_series:

		case ni_gpct_variant_e_series:
@@ -1222,13 +1225,8 @@ static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned int gate_index, 
			*gate_source |= CR_EDGE;

			*gate_source |= CR_EDGE;

		break;

		break;

	case 1:

	case 1:

		if ((mode & GI_GATING_MODE_MASK) == GI_GATING_DISABLED ||

		reg = NITIO_GATE2_REG(cidx);

		    !(counter_dev->regs[gate2_reg] & GI_GATE2_MODE)) {

		gate = GI_BITS_TO_GATE2(counter_dev->regs[reg]);

			*gate_source = NI_GPCT_DISABLED_GATE_SELECT;

			return 0;

		}



		gate = GI_BITS_TO_GATE2(counter_dev->regs[gate2_reg]);





		switch (counter_dev->variant) {

		switch (counter_dev->variant) {

		case ni_gpct_variant_e_series:

		case ni_gpct_variant_e_series:
@@ -1240,7 +1238,7 @@ static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned int gate_index, 
			*gate_source = ni_660x_gate2_to_generic_gate(gate);

			*gate_source = ni_660x_gate2_to_generic_gate(gate);

			break;

			break;

		}

		}

		if (counter_dev->regs[gate2_reg] & GI_GATE2_POL_INVERT)

		if (counter_dev->regs[reg] & GI_GATE2_POL_INVERT)

			*gate_source |= CR_INVERT;

			*gate_source |= CR_INVERT;

		/* second gate can't have edge/level mode set independently */

		/* second gate can't have edge/level mode set independently */

		if ((mode & GI_GATING_MODE_MASK) != GI_LEVEL_GATING)

		if ((mode & GI_GATING_MODE_MASK) != GI_LEVEL_GATING)