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

Commit 840d435f authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pci230: collapse some 'else { if' chains 



Where the only thing in an `else { ... }` block is another `if`
statement, collapse it to an `else if {` block where it makes sense to
do so.

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

drivers/staging/comedi/drivers/amplc_pci230.c

+22 −33
Original line number Diff line number Diff line
@@ -1844,23 +1844,17 @@ static void pci230_ai_update_fifo_trigger_level(struct comedi_device *dev, 
	unsigned short triglev;

	unsigned short adccon;



	if (cmd->flags & TRIG_WAKE_EOS) {

		/* Wake at end of scan. */

	if (cmd->flags & TRIG_WAKE_EOS)

		wake = scanlen - devpriv->ai_scan_pos;

	} else {

		if (cmd->stop_src != TRIG_COUNT ||

	else if (cmd->stop_src != TRIG_COUNT ||

		 devpriv->ai_scan_count >= PCI230_ADC_FIFOLEVEL_HALFFULL ||

		    scanlen >= PCI230_ADC_FIFOLEVEL_HALFFULL) {

		 scanlen >= PCI230_ADC_FIFOLEVEL_HALFFULL)

		wake = PCI230_ADC_FIFOLEVEL_HALFFULL;

		} else {

			wake = devpriv->ai_scan_count * scanlen -

			       devpriv->ai_scan_pos;

		}

	}

	else

		wake = devpriv->ai_scan_count * scanlen - devpriv->ai_scan_pos;

	if (wake >= PCI230_ADC_FIFOLEVEL_HALFFULL) {

		triglev = PCI230_ADC_INT_FIFO_HALF;

	} else {

		if (wake > 1 && devpriv->hwver > 0) {

	} else if (wake > 1 && devpriv->hwver > 0) {

		/* PCI230+/260+ programmable FIFO interrupt level. */

		if (devpriv->adcfifothresh != wake) {

			devpriv->adcfifothresh = wake;
@@ -1870,7 +1864,6 @@ static void pci230_ai_update_fifo_trigger_level(struct comedi_device *dev, 
	} else {

		triglev = PCI230_ADC_INT_FIFO_NEMPTY;

	}

	}

	adccon = (devpriv->adccon & ~PCI230_ADC_INT_FIFO_MASK) | triglev;

	if (adccon != devpriv->adccon) {

		devpriv->adccon = adccon;
@@ -2211,21 +2204,17 @@ static void pci230_handle_ai(struct comedi_device *dev, 
			} else if (status_fifo & PCI230_ADC_FIFO_HALF) {

				/* FIFO half full. */

				fifoamount = PCI230_ADC_FIFOLEVEL_HALFFULL;

			} else {

				/* FIFO not empty. */

				if (devpriv->hwver > 0) {

			} else if (devpriv->hwver > 0) {

				/* Read PCI230+/260+ ADC FIFO level. */

				fifoamount = inw(devpriv->daqio +

						 PCI230P_ADCFFLEV);

					if (fifoamount == 0) {

						/* Shouldn't happen. */

						break;

					}

				if (fifoamount == 0)

					break;	/* Shouldn't happen. */

			} else {

				/* FIFO not empty. */

				fifoamount = 1;

			}

		}

		}

		/* Read sample and store in Comedi's circular buffer. */

		if (comedi_buf_put(s, pci230_ai_read(dev)) == 0) {

			events |= COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW;