Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / adl_pci9118.c

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 4f9fd7dd0cf26a23c92454f1f65653d8dd54f8f6..ccef549778e409c7eb3249f1e69cb7b7728c4d58 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -63,7 +63,6 @@ Configuration options:
 
 */
 #include "../comedidev.h"
-#include "../pci_ids.h"
 
 #include <linux/delay.h>
 #include <linux/gfp.h>
@@ -74,6 +73,8 @@ Configuration options:
 #include "comedi_pci.h"
 #include "comedi_fc.h"
 
+#define PCI_VENDOR_ID_AMCC     0x10e8
+
 /* paranoid checks are broken */
 #undef PCI9118_PARANOIDCHECK   /*
                                 * if defined, then is used code which control
@@ -496,11 +497,11 @@ static int pci9118_insn_write_ao(struct comedi_device *dev,
        int n, chanreg, ch;
 
        ch = CR_CHAN(insn->chanspec);
-       if (ch) {
+       if (ch)
                chanreg = PCI9118_DA2;
-       } else {
+       else
                chanreg = PCI9118_DA1;
-       }
+
 
        for (n = 0; n < insn->n; n++) {
                outl(data[n], dev->iobase + chanreg);
@@ -663,11 +664,11 @@ static void pci9118_ai_munge(struct comedi_device *dev,
        for (i = 0; i < num_samples; i++) {
                if (devpriv->usedma)
                        array[i] = be16_to_cpu(array[i]);
-               if (devpriv->ai16bits) {
+               if (devpriv->ai16bits)
                        array[i] ^= 0x8000;
-               } else {
+               else
                        array[i] = (array[i] >> 4) & 0x0fff;
-               }
+
        }
 }
 
@@ -750,9 +751,8 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev,
                comedi_event(dev, s);
                return;
        }
-
        if (int_adstat & devpriv->ai_maskerr)
-/* if (int_adstat & 0x106) */
+                                       /* if (int_adstat & 0x106) */
                if (pci9118_decode_error_status(dev, s, int_adstat))
                        return;
 
@@ -921,7 +921,8 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
                              struct comedi_cmd *cmd)
 {
        int err = 0;
-       int tmp, divisor1 = 0, divisor2 = 0;
+       int tmp;
+       unsigned int divisor1 = 0, divisor2 = 0;
 
        /* step 1: make sure trigger sources are trivially valid */
 
@@ -931,20 +932,20 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
                err++;
 
        tmp = cmd->scan_begin_src;
-       if (devpriv->master) {
+       if (devpriv->master)
                cmd->scan_begin_src &= TRIG_TIMER | TRIG_EXT | TRIG_FOLLOW;
-       } else {
+       else
                cmd->scan_begin_src &= TRIG_FOLLOW;
-       }
+
        if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
                err++;
 
        tmp = cmd->convert_src;
-       if (devpriv->master) {
+       if (devpriv->master)
                cmd->convert_src &= TRIG_TIMER | TRIG_EXT | TRIG_NOW;
-       } else {
+       else
                cmd->convert_src &= TRIG_TIMER | TRIG_EXT;
-       }
+
        if (!cmd->convert_src || tmp != cmd->convert_src)
                err++;
 
@@ -1909,9 +1910,9 @@ static int setup_channel_list(struct comedi_device *dev,
        }
 #ifdef PCI9118_EXTDEBUG
        DPRINTK("CHL: ");
-       for (i = 0; i <= (useeos * n_chan); i++) {
+       for (i = 0; i <= (useeos * n_chan); i++)
                DPRINTK("%04x ", devpriv->chanlist[i]);
-       }
+
        DPRINTK("\n ");
 #endif
 #endif
@@ -2215,17 +2216,17 @@ static int pci9118_attach(struct comedi_device *dev,
 
        if (!pcidev) {
                if (opt_bus || opt_slot) {
-                       printk(" - Card at b:s %d:%d %s\n",
+                       printk(KERN_ERR " - Card at b:s %d:%d %s\n",
                               opt_bus, opt_slot, errstr);
                } else {
-                       printk(" - Card %s\n", errstr);
+                       printk(KERN_ERR " - Card %s\n", errstr);
                }
                return -EIO;
        }
 
-       if (master) {
+       if (master)
                pci_set_master(pcidev);
-       }
+
 
        pci_bus = pcidev->bus->number;
        pci_slot = PCI_SLOT(pcidev->devfn);
@@ -2234,8 +2235,8 @@ static int pci9118_attach(struct comedi_device *dev,
        iobase_a = pci_resource_start(pcidev, 0);
        iobase_9 = pci_resource_start(pcidev, 2);
 
-       printk(", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx", pci_bus, pci_slot,
-              pci_func, iobase_9, iobase_a);
+       printk(KERN_ERR ", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx", pci_bus,
+                               pci_slot, pci_func, iobase_9, iobase_a);
 
        dev->iobase = iobase_9;
        dev->board_name = this_board->name;
@@ -2336,11 +2337,11 @@ static int pci9118_attach(struct comedi_device *dev,
        dev->read_subdev = s;
        s->type = COMEDI_SUBD_AI;
        s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
-       if (devpriv->usemux) {
+       if (devpriv->usemux)
                s->n_chan = devpriv->usemux;
-       } else {
+       else
                s->n_chan = this_board->n_aichan;
-       }
+
        s->maxdata = this_board->ai_maxdata;
        s->len_chanlist = this_board->n_aichanlist;
        s->range_table = this_board->rangelist_ai;
@@ -2412,9 +2413,9 @@ static int pci9118_detach(struct comedi_device *dev)
                if (dev->irq)
                        free_irq(dev->irq, dev);
                if (devpriv->pcidev) {
-                       if (dev->iobase) {
+                       if (dev->iobase)
                                comedi_pci_disable(devpriv->pcidev);
-                       }
+
                        pci_dev_put(devpriv->pcidev);
                }
                if (devpriv->dmabuf_virt[0])