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

staging: comedi: pcmmio: cleanup indent levels in interrupt_pcmmio() 



Remove the extra indent levels in this function that resulted from
code removed in previous patches.

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 0cc9a4e4

drivers/staging/comedi/drivers/pcmmio.c

+73 −109
Original line number Diff line number Diff line
@@ -359,11 +359,9 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) 
	struct comedi_device *dev = d;

	struct pcmmio_private *devpriv = dev->private;

	struct comedi_subdevice *s = dev->read_subdev;

	unsigned triggered = 0;

	int got1 = 0;



	unsigned long flags;

			unsigned triggered = 0;

			/* it is an interrupt for ASIC #asic */

	unsigned char int_pend;



	spin_lock_irqsave(&devpriv->pagelock, flags);
@@ -373,27 +371,19 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) 


	if (int_pend) {

		int port;

				for (port = 0; port < INTR_PORTS_PER_ASIC;

				     ++port) {

		for (port = 0; port < INTR_PORTS_PER_ASIC; ++port) {

			if (int_pend & (0x1 << port)) {

						unsigned char

						    io_lines_with_edges = 0;

				unsigned char io_lines_with_edges = 0;

				switch_page(dev, PCMMIO_PAGE_INT_ID);

						io_lines_with_edges =

						    inb(dev->iobase +

				io_lines_with_edges = inb(dev->iobase +

							PCMMIO_PAGE_REG(port));



				/* clear pending interrupt */

				if (io_lines_with_edges)

							/*

							 * clear pending

							 * interrupt

							 */

					outb(0, dev->iobase +

					     PCMMIO_PAGE_REG(port));



						triggered |=

						    io_lines_with_edges <<

						    port * 8;

				triggered |= io_lines_with_edges << port * 8;

			}

		}
@@ -403,54 +393,34 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) 
	spin_unlock_irqrestore(&devpriv->pagelock, flags);



	if (triggered) {

				/*

				 * TODO here: dispatch io lines to subdevs

				 * with commands..

				 */

		/* TODO here: dispatch io lines to subdevs with commands */

		unsigned long flags;

		unsigned oldevents;



						spin_lock_irqsave(&devpriv->spinlock,

								  flags);

		spin_lock_irqsave(&devpriv->spinlock, flags);



		oldevents = s->async->events;



		if (devpriv->active) {

							unsigned mytrig =

							    ((triggered >> 0)

							     &

							     ((0x1 << 24) -

							      1)) << 0;

							if (mytrig &

							    devpriv->enabled_mask) {

								unsigned int val

								    = 0;

								unsigned int n,

								    ch, len;



								len =

								    s->

								    async->cmd.chanlist_len;

								for (n = 0;

								     n < len;

								     n++) {

			unsigned mytrig = ((triggered >> 0) & ((1 << 24) - 1)) << 0;

			if (mytrig & devpriv->enabled_mask) {

				unsigned int val = 0;

				unsigned int n, ch, len;



				len = s->async->cmd.chanlist_len;

				for (n = 0; n < len; n++) {

					ch = CR_CHAN(s->async->cmd.chanlist[n]);

					if (mytrig & (1U << ch))

						val |= (1U << n);

				}

				/* Write the scan to the buffer. */

								if (comedi_buf_put(s->async, val)

								    &&

								    comedi_buf_put

								    (s->async,

								     val >> 16)) {

				if (comedi_buf_put(s->async, val) &&

				    comedi_buf_put (s->async, val >> 16)) {

					s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS);

				} else {

					/* Overflow! Stop acquisition!! */

					/* TODO: STOP_ACQUISITION_CALL_HERE!! */

									pcmmio_stop_intr

									    (dev,

									     s);

					pcmmio_stop_intr(dev, s);

				}



				/* Check for end of acquisition. */
@@ -461,25 +431,19 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) 
						if (devpriv->stop_count == 0) {

							s->async->events |= COMEDI_CB_EOA;

							/* TODO: STOP_ACQUISITION_CALL_HERE!! */

											pcmmio_stop_intr

											    (dev,

											     s);

							pcmmio_stop_intr(dev, s);

						}

					}

				}

			}

		}



						spin_unlock_irqrestore

						    (&devpriv->spinlock, flags);

		spin_unlock_irqrestore(&devpriv->spinlock, flags);



						if (oldevents !=

						    s->async->events) {

		if (oldevents != s->async->events)

			comedi_event(dev, s);

	}



			}



	if (!got1)

		return IRQ_NONE;	/* interrupt from other source */

	return IRQ_HANDLED;