- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / comedi / drivers / dt3000.c

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index bbbef79..ca68789 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -314,9 +314,8 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
                        break;
                udelay(1);
        }
-       if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR) {
+       if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR)
                return 0;
-       }
 
        printk("dt3k_send_cmd() timeout/error status=0x%04x\n", status);
 
@@ -359,9 +358,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)
        struct comedi_subdevice *s;
        unsigned int status;
 
-       if (!dev->attached) {
+       if (!dev->attached)
                return IRQ_NONE;
-       }
 
        s = dev->subdevices + 0;
        status = readw(devpriv->io_addr + DPR_Intr_Flag);
@@ -374,9 +372,8 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)
                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;
-       }
 
        debug_n_ints++;
        if (debug_n_ints >= 10) {
@@ -399,9 +396,8 @@ static void debug_intr_flags(unsigned int flags)
        int i;
        printk("dt3k: intr_flags:");
        for (i = 0; i < 8; i++) {
-               if (flags & (1 << i)) {
+               if (flags & (1 << i))
                        printk(" %s", intr_flags[i]);
-               }
        }
        printk("\n");
 }
@@ -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 */
        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);
-       }
 
        return i;
 }
@@ -720,9 +715,8 @@ static int dt3k_ao_insn_read(struct comedi_device *dev,
        unsigned int chan;
 
        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];
-       }
 
        return i;
 }
@@ -911,9 +905,8 @@ static int dt3000_detach(struct comedi_device *dev)
 
        if (devpriv) {
                if (devpriv->pci_dev) {
-                       if (devpriv->phys_addr) {
+                       if (devpriv->phys_addr)
                                comedi_pci_disable(devpriv->pci_dev);
-                       }
                        pci_dev_put(devpriv->pci_dev);
                }
                if (devpriv->io_addr)