Commit a41aec1b authored by Jason Wong's avatar Jason Wong Committed by Greg Kroah-Hartman

Staging: comedi: adl_pci9118: fixed multiple brace coding style issues

Fixed multiple coding style issues
Signed-off-by: default avatarJason Wong <tsanghan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f4af2361
...@@ -496,11 +496,11 @@ static int pci9118_insn_write_ao(struct comedi_device *dev, ...@@ -496,11 +496,11 @@ static int pci9118_insn_write_ao(struct comedi_device *dev,
int n, chanreg, ch; int n, chanreg, ch;
ch = CR_CHAN(insn->chanspec); ch = CR_CHAN(insn->chanspec);
if (ch) { if (ch)
chanreg = PCI9118_DA2; chanreg = PCI9118_DA2;
} else { else
chanreg = PCI9118_DA1; chanreg = PCI9118_DA1;
}
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
outl(data[n], dev->iobase + chanreg); outl(data[n], dev->iobase + chanreg);
...@@ -663,11 +663,11 @@ static void pci9118_ai_munge(struct comedi_device *dev, ...@@ -663,11 +663,11 @@ static void pci9118_ai_munge(struct comedi_device *dev,
for (i = 0; i < num_samples; i++) { for (i = 0; i < num_samples; i++) {
if (devpriv->usedma) if (devpriv->usedma)
array[i] = be16_to_cpu(array[i]); array[i] = be16_to_cpu(array[i]);
if (devpriv->ai16bits) { if (devpriv->ai16bits)
array[i] ^= 0x8000; array[i] ^= 0x8000;
} else { else
array[i] = (array[i] >> 4) & 0x0fff; array[i] = (array[i] >> 4) & 0x0fff;
}
} }
} }
...@@ -930,20 +930,20 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, ...@@ -930,20 +930,20 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
err++; err++;
tmp = cmd->scan_begin_src; tmp = cmd->scan_begin_src;
if (devpriv->master) { if (devpriv->master)
cmd->scan_begin_src &= TRIG_TIMER | TRIG_EXT | TRIG_FOLLOW; cmd->scan_begin_src &= TRIG_TIMER | TRIG_EXT | TRIG_FOLLOW;
} else { else
cmd->scan_begin_src &= TRIG_FOLLOW; cmd->scan_begin_src &= TRIG_FOLLOW;
}
if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
err++; err++;
tmp = cmd->convert_src; tmp = cmd->convert_src;
if (devpriv->master) { if (devpriv->master)
cmd->convert_src &= TRIG_TIMER | TRIG_EXT | TRIG_NOW; cmd->convert_src &= TRIG_TIMER | TRIG_EXT | TRIG_NOW;
} else { else
cmd->convert_src &= TRIG_TIMER | TRIG_EXT; cmd->convert_src &= TRIG_TIMER | TRIG_EXT;
}
if (!cmd->convert_src || tmp != cmd->convert_src) if (!cmd->convert_src || tmp != cmd->convert_src)
err++; err++;
...@@ -1908,9 +1908,9 @@ static int setup_channel_list(struct comedi_device *dev, ...@@ -1908,9 +1908,9 @@ static int setup_channel_list(struct comedi_device *dev,
} }
#ifdef PCI9118_EXTDEBUG #ifdef PCI9118_EXTDEBUG
DPRINTK("CHL: "); DPRINTK("CHL: ");
for (i = 0; i <= (useeos * n_chan); i++) { for (i = 0; i <= (useeos * n_chan); i++)
DPRINTK("%04x ", devpriv->chanlist[i]); DPRINTK("%04x ", devpriv->chanlist[i]);
}
DPRINTK("\n "); DPRINTK("\n ");
#endif #endif
#endif #endif
...@@ -2222,9 +2222,9 @@ static int pci9118_attach(struct comedi_device *dev, ...@@ -2222,9 +2222,9 @@ static int pci9118_attach(struct comedi_device *dev,
return -EIO; return -EIO;
} }
if (master) { if (master)
pci_set_master(pcidev); pci_set_master(pcidev);
}
pci_bus = pcidev->bus->number; pci_bus = pcidev->bus->number;
pci_slot = PCI_SLOT(pcidev->devfn); pci_slot = PCI_SLOT(pcidev->devfn);
...@@ -2335,11 +2335,11 @@ static int pci9118_attach(struct comedi_device *dev, ...@@ -2335,11 +2335,11 @@ static int pci9118_attach(struct comedi_device *dev,
dev->read_subdev = s; dev->read_subdev = s;
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
if (devpriv->usemux) { if (devpriv->usemux)
s->n_chan = devpriv->usemux; s->n_chan = devpriv->usemux;
} else { else
s->n_chan = this_board->n_aichan; s->n_chan = this_board->n_aichan;
}
s->maxdata = this_board->ai_maxdata; s->maxdata = this_board->ai_maxdata;
s->len_chanlist = this_board->n_aichanlist; s->len_chanlist = this_board->n_aichanlist;
s->range_table = this_board->rangelist_ai; s->range_table = this_board->rangelist_ai;
...@@ -2411,9 +2411,9 @@ static int pci9118_detach(struct comedi_device *dev) ...@@ -2411,9 +2411,9 @@ static int pci9118_detach(struct comedi_device *dev)
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (devpriv->pcidev) { if (devpriv->pcidev) {
if (dev->iobase) { if (dev->iobase)
comedi_pci_disable(devpriv->pcidev); comedi_pci_disable(devpriv->pcidev);
}
pci_dev_put(devpriv->pcidev); pci_dev_put(devpriv->pcidev);
} }
if (devpriv->dmabuf_virt[0]) if (devpriv->dmabuf_virt[0])
......
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