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

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

staging: comedi: serial2000: reduce indent level of serial2002_setup_subdevs() 



Tidy up this function a bit to reduce the indent level.

This also fixex the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96afd186

drivers/staging/comedi/drivers/serial2002.c

+50 −52
Original line number Diff line number Diff line
@@ -422,17 +422,17 @@ static int serial2002_setup_subdevs(struct comedi_device *dev) 
	serial2002_tty_setspeed(devpriv->tty, devpriv->speed);

	serial2002_poll_channel(devpriv->tty, 31);

	while (1) {

		struct serial_data data;

		struct serial_data data = serial2002_read(devpriv->tty, 1000);

		int kind = S2002_CFG_KIND(data.value);

		int channel = S2002_CFG_CHAN(data.value);

		int range = S2002_CFG_BASE(data.value);

		int cmd = S2002_CFG_CMD(data.value);



		data = serial2002_read(devpriv->tty, 1000);

		if (data.kind != is_channel || data.index != 31 ||

		    S2002_CFG_KIND(data.value) == S2002_CFG_KIND_INVALID) {

		    kind == S2002_CFG_KIND_INVALID)

			break;

		} else {

			int channel = S2002_CFG_CHAN(data.value);

			int range = S2002_CFG_BASE(data.value);



			switch (S2002_CFG_KIND(data.value)) {

		switch (kind) {

		case S2002_CFG_KIND_DIGITAL_IN:

			cfg = di_cfg;

			break;
@@ -455,9 +455,9 @@ static int serial2002_setup_subdevs(struct comedi_device *dev) 
		if (!cfg)

			continue;	/* unknown kind, skip it */



			cfg[channel].kind = S2002_CFG_KIND(data.value);

		cfg[channel].kind = kind;



			switch (S2002_CFG_CMD(data.value)) {

		switch (cmd) {

		case S2002_CFG_CMD_BITS:

			cfg[channel].bits = S2002_CFG_BITS(data.value);

			break;
@@ -476,15 +476,13 @@ static int serial2002_setup_subdevs(struct comedi_device *dev) 
			}

			if (S2002_CFG_SIGN(data.value))

				range = -range;

				if (S2002_CFG_CMD(data.value) ==

				    S2002_CFG_CMD_MIN)

			if (cmd == S2002_CFG_CMD_MIN)

				cfg[channel].min = range;

			else

				cfg[channel].max = range;

			break;

		}

	}

	}



	/* Fill in subdevice data */

	for (i = 0; i <= 4; i++) {