Commit f4af2361 authored by Stefan Schick's avatar Stefan Schick Committed by Greg Kroah-Hartman

Staging: comedi: dt3000: fixed some coding style issues

Fixed some coding style issues
Signed-off-by: default avatarStefan Schick <stinder21@googlemail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d4a505e8
...@@ -314,9 +314,8 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd) ...@@ -314,9 +314,8 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
break; break;
udelay(1); udelay(1);
} }
if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR) { if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR)
return 0; return 0;
}
printk("dt3k_send_cmd() timeout/error status=0x%04x\n", status); printk("dt3k_send_cmd() timeout/error status=0x%04x\n", status);
...@@ -359,9 +358,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d) ...@@ -359,9 +358,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned int status; unsigned int status;
if (!dev->attached) { if (!dev->attached)
return IRQ_NONE; return IRQ_NONE;
}
s = dev->subdevices + 0; s = dev->subdevices + 0;
status = readw(devpriv->io_addr + DPR_Intr_Flag); status = readw(devpriv->io_addr + DPR_Intr_Flag);
...@@ -374,9 +372,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d) ...@@ -374,9 +372,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)
s->async->events |= COMEDI_CB_BLOCK; s->async->events |= COMEDI_CB_BLOCK;
} }
if (status & (DT3000_ADSWERR | DT3000_ADHWERR)) { if (status & (DT3000_ADSWERR | DT3000_ADHWERR))
s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA; s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
}
debug_n_ints++; debug_n_ints++;
if (debug_n_ints >= 10) { if (debug_n_ints >= 10) {
...@@ -399,10 +396,9 @@ static void debug_intr_flags(unsigned int flags) ...@@ -399,10 +396,9 @@ static void debug_intr_flags(unsigned int flags)
int i; int i;
printk("dt3k: intr_flags:"); printk("dt3k: intr_flags:");
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (flags & (1 << i)) { if (flags & (1 << i))
printk(" %s", intr_flags[i]); printk(" %s", intr_flags[i]);
} }
}
printk("\n"); printk("\n");
} }
#endif #endif
...@@ -690,9 +686,8 @@ static int dt3k_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -690,9 +686,8 @@ static int dt3k_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
/* XXX docs don't explain how to select aref */ /* XXX docs don't explain how to select aref */
aref = CR_AREF(insn->chanspec); aref = CR_AREF(insn->chanspec);
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++)
data[i] = dt3k_readsingle(dev, SUBS_AI, chan, gain); data[i] = dt3k_readsingle(dev, SUBS_AI, chan, gain);
}
return i; return i;
} }
...@@ -720,9 +715,8 @@ static int dt3k_ao_insn_read(struct comedi_device *dev, ...@@ -720,9 +715,8 @@ static int dt3k_ao_insn_read(struct comedi_device *dev,
unsigned int chan; unsigned int chan;
chan = CR_CHAN(insn->chanspec); chan = CR_CHAN(insn->chanspec);
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++)
data[i] = devpriv->ao_readback[chan]; data[i] = devpriv->ao_readback[chan];
}
return i; return i;
} }
...@@ -911,9 +905,8 @@ static int dt3000_detach(struct comedi_device *dev) ...@@ -911,9 +905,8 @@ static int dt3000_detach(struct comedi_device *dev)
if (devpriv) { if (devpriv) {
if (devpriv->pci_dev) { if (devpriv->pci_dev) {
if (devpriv->phys_addr) { if (devpriv->phys_addr)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(devpriv->pci_dev);
}
pci_dev_put(devpriv->pci_dev); pci_dev_put(devpriv->pci_dev);
} }
if (devpriv->io_addr) if (devpriv->io_addr)
......
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