Commit 352f9174 authored by Ravishankar karkala Mallikarjunayya's avatar Ravishankar karkala Mallikarjunayya Committed by Greg Kroah-Hartman

Staging: comedi: fix brace coding style issue in daqboard2000.c

This is a patch to the daqboard2000.c file that fixes up a brace
warning found by the checkpatch.pl tool.
Signed-off-by: default avatarRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 61a8d955
...@@ -657,9 +657,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev) ...@@ -657,9 +657,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
/* Set the + reference dac value in the FPGA */ /* Set the + reference dac value in the FPGA */
fpga->refDacs = 0x80 | DAQBOARD2000_PosRefDacSelect; fpga->refDacs = 0x80 | DAQBOARD2000_PosRefDacSelect;
for (timeout = 0; timeout < 20; timeout++) { for (timeout = 0; timeout < 20; timeout++) {
if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0) { if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0)
break; break;
}
udelay(2); udelay(2);
} }
/* printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/ /* printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/
...@@ -667,9 +666,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev) ...@@ -667,9 +666,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
/* Set the - reference dac value in the FPGA */ /* Set the - reference dac value in the FPGA */
fpga->refDacs = 0x80 | DAQBOARD2000_NegRefDacSelect; fpga->refDacs = 0x80 | DAQBOARD2000_NegRefDacSelect;
for (timeout = 0; timeout < 20; timeout++) { for (timeout = 0; timeout < 20; timeout++) {
if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0) { if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0)
break; break;
}
udelay(2); udelay(2);
} }
/* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/ /* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/
...@@ -742,9 +740,9 @@ static int daqboard2000_attach(struct comedi_device *dev, ...@@ -742,9 +740,9 @@ static int daqboard2000_attach(struct comedi_device *dev,
slot = it->options[1]; slot = it->options[1];
result = alloc_private(dev, sizeof(struct daqboard2000_private)); result = alloc_private(dev, sizeof(struct daqboard2000_private));
if (result < 0) { if (result < 0)
return -ENOMEM; return -ENOMEM;
}
for (card = pci_get_device(0x1616, 0x0409, NULL); for (card = pci_get_device(0x1616, 0x0409, NULL);
card != NULL; card = pci_get_device(0x1616, 0x0409, card)) { card != NULL; card = pci_get_device(0x1616, 0x0409, card)) {
if (bus || slot) { if (bus || slot) {
...@@ -793,9 +791,8 @@ static int daqboard2000_attach(struct comedi_device *dev, ...@@ -793,9 +791,8 @@ static int daqboard2000_attach(struct comedi_device *dev,
ioremap(pci_resource_start(card, 0), DAQBOARD2000_PLX_SIZE); ioremap(pci_resource_start(card, 0), DAQBOARD2000_PLX_SIZE);
devpriv->daq = devpriv->daq =
ioremap(pci_resource_start(card, 2), DAQBOARD2000_DAQ_SIZE); ioremap(pci_resource_start(card, 2), DAQBOARD2000_DAQ_SIZE);
if (!devpriv->plx || !devpriv->daq) { if (!devpriv->plx || !devpriv->daq)
return -ENOMEM; return -ENOMEM;
}
result = alloc_subdevices(dev, 3); result = alloc_subdevices(dev, 3);
if (result < 0) if (result < 0)
...@@ -868,18 +865,17 @@ static int daqboard2000_detach(struct comedi_device *dev) ...@@ -868,18 +865,17 @@ static int daqboard2000_detach(struct comedi_device *dev)
if (dev->subdevices) if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2); subdev_8255_cleanup(dev, dev->subdevices + 2);
if (dev->irq) { if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
}
if (devpriv) { if (devpriv) {
if (devpriv->daq) if (devpriv->daq)
iounmap(devpriv->daq); iounmap(devpriv->daq);
if (devpriv->plx) if (devpriv->plx)
iounmap(devpriv->plx); iounmap(devpriv->plx);
if (devpriv->pci_dev) { if (devpriv->pci_dev) {
if (devpriv->got_regions) { if (devpriv->got_regions)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(devpriv->pci_dev);
}
pci_dev_put(devpriv->pci_dev); pci_dev_put(devpriv->pci_dev);
} }
} }
......
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