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

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

staging: comedi: das1800: absorb control_a_bits() 



Absorb this helper function into the analog input (*do_cmd).
For aesthetics, convert the switch code into if/else.

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 cfc2236b

drivers/staging/comedi/drivers/das1800.c

+7 −24
Original line number Diff line number Diff line
@@ -727,28 +727,6 @@ static int das1800_ai_cmdtest(struct comedi_device *dev, 
	return 0;

}



/* returns appropriate bits for control register a, depending on command */

static int control_a_bits(const struct comedi_cmd *cmd)

{

	int control_a;



	control_a = FFEN;	/* enable fifo */

	if (cmd->stop_src == TRIG_EXT)

		control_a |= ATEN;

	switch (cmd->start_src) {

	case TRIG_EXT:

		control_a |= TGEN | CGSL;

		break;

	case TRIG_NOW:

		control_a |= CGEN;

		break;

	default:

		break;

	}



	return control_a;

}



static unsigned char das1800_ai_chanspec_bits(struct comedi_subdevice *s,

					      unsigned int chanspec)

{
@@ -885,8 +863,13 @@ static int das1800_ai_cmd(struct comedi_device *dev, 


	devpriv->ai_is_unipolar = comedi_range_is_unipolar(s, range0);



	/*  determine proper bits for control registers */

	control_a = control_a_bits(cmd);

	control_a = FFEN;

	if (cmd->stop_src == TRIG_EXT)

		control_a |= ATEN;

	if (cmd->start_src == TRIG_EXT)

		control_a |= TGEN | CGSL;

	else /* TRIG_NOW */

		control_a |= CGEN;



	control_c = das1800_ai_chanspec_bits(s, cmd->chanlist[0]);

	/* set clock source to internal or external */