Commit ed7dcb47 authored by Tomas Melin's avatar Tomas Melin Committed by Greg Kroah-Hartman

Staging: Comedi adv_pci1710 : Corrected over 80 column warnings

Various comments and code lines longer than 80 chars fixed in file adv_pci1710.c.
Signed-off-by: default avatarTomas Melin <tomas.melin@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb1648b4
...@@ -674,7 +674,9 @@ static void interrupt_pci1710_every_sample(void *d) ...@@ -674,7 +674,9 @@ static void interrupt_pci1710_every_sample(void *d)
s->async->buf_int_count, s->async->buf_int_ptr, s->async->buf_int_count, s->async->buf_int_ptr,
s->async->buf_user_count, s->async->buf_user_ptr); s->async->buf_user_count, s->async->buf_user_ptr);
DPRINTK("adv_pci1710 EDBG: EOS2\n"); DPRINTK("adv_pci1710 EDBG: EOS2\n");
if ((!devpriv->neverending_ai) && (devpriv->ai_act_scan >= devpriv->ai_scans)) { /* all data sampled */ if ((!devpriv->neverending_ai) &&
(devpriv->ai_act_scan >= devpriv->ai_scans)) {
/* all data sampled */
pci171x_ai_cancel(dev, s); pci171x_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
comedi_event(dev, s); comedi_event(dev, s);
...@@ -802,8 +804,8 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d) ...@@ -802,8 +804,8 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
irq); irq);
if (!dev->attached) /* is device attached? */ if (!dev->attached) /* is device attached? */
return IRQ_NONE; /* no, exit */ return IRQ_NONE; /* no, exit */
/* is this interrupt from our board? */
if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ)) /* is this interrupt from our board? */ if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ))
return IRQ_NONE; /* no, exit */ return IRQ_NONE; /* no, exit */
DPRINTK("adv_pci1710 EDBG: interrupt_service_pci1710() ST: %4x\n", DPRINTK("adv_pci1710 EDBG: interrupt_service_pci1710() ST: %4x\n",
...@@ -812,7 +814,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d) ...@@ -812,7 +814,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
if (devpriv->ai_et) { /* Switch from initial TRIG_EXT to TRIG_xxx. */ if (devpriv->ai_et) { /* Switch from initial TRIG_EXT to TRIG_xxx. */
devpriv->ai_et = 0; devpriv->ai_et = 0;
devpriv->CntrlReg &= Control_CNT0; devpriv->CntrlReg &= Control_CNT0;
devpriv->CntrlReg |= Control_SW; /* set software trigger */ devpriv->CntrlReg |= Control_SW; /* set software trigger */
outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL); outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);
devpriv->CntrlReg = devpriv->ai_et_CntrlReg; devpriv->CntrlReg = devpriv->ai_et_CntrlReg;
outb(0, dev->iobase + PCI171x_CLRFIFO); outb(0, dev->iobase + PCI171x_CLRFIFO);
...@@ -863,7 +865,8 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, ...@@ -863,7 +865,8 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
devpriv->neverending_ai = 0; devpriv->neverending_ai = 0;
devpriv->CntrlReg &= Control_CNT0; devpriv->CntrlReg &= Control_CNT0;
if ((devpriv->ai_flags & TRIG_WAKE_EOS)) { /* don't we want wake up every scan? devpriv->ai_eos=1; */ /* don't we want wake up every scan? devpriv->ai_eos=1; */
if ((devpriv->ai_flags & TRIG_WAKE_EOS)) {
devpriv->ai_eos = 1; devpriv->ai_eos = 1;
} else { } else {
devpriv->CntrlReg |= Control_ONEFH; devpriv->CntrlReg |= Control_ONEFH;
...@@ -980,13 +983,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, ...@@ -980,13 +983,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG #ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(1, cmd); pci171x_cmdtest_out(1, cmd);
#endif #endif
DPRINTK DPRINTK(
("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n", "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
err); err);
return 1; return 1;
} }
/* step 2: make sure trigger sources are unique and mutually compatible */ /* step2: make sure trigger srcs are unique and mutually compatible */
if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) { if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {
cmd->start_src = TRIG_NOW; cmd->start_src = TRIG_NOW;
...@@ -1013,9 +1016,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, ...@@ -1013,9 +1016,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG #ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(2, cmd); pci171x_cmdtest_out(2, cmd);
#endif #endif
DPRINTK DPRINTK(
("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n", "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
err); err);
return 2; return 2;
} }
...@@ -1063,9 +1066,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, ...@@ -1063,9 +1066,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG #ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(3, cmd); pci171x_cmdtest_out(3, cmd);
#endif #endif
DPRINTK DPRINTK(
("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n", "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
err); err);
return 3; return 3;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment