From 7dbc663544e7f8d7183ee8c7637bdc3f72819f49 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 18 Sep 2012 18:48:16 -0700 Subject: [PATCH] --- yaml --- r: 325423 b: refs/heads/master c: 1403e797573bc9929d2a5f055dd7dba9184c47c9 h: refs/heads/master i: 325421: 6f619ad610b1942bd94848e26f3421fc1dc23f7c 325419: 3957f8ad7bdace165220d0365d1b85f87e654e99 325415: 5ba478680d6fdd39a328aabb9b718ebd92c50aaa 325407: 4808c63967cedb1a27942468f5a3c9e530138d2f v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/daqboard2000.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 3442d458e37c..53e8ac6836bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1387d4b7f05db3d3cf156861f7c942b1031df51b +refs/heads/master: 1403e797573bc9929d2a5f055dd7dba9184c47c9 diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index 032be980d87f..22d4733867f2 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -336,7 +336,6 @@ static void setup_sampling(struct comedi_device *dev, int chan, int gain) /* These should be read from EEPROM */ word2 |= 0x0800; word3 |= 0xc000; -/* printk("%d %4.4x %4.4x %4.4x %4.4x\n", chan, word0, word1, word2, word3);*/ writeAcqScanListEntry(dev, word0); writeAcqScanListEntry(dev, word1); writeAcqScanListEntry(dev, word2); @@ -607,7 +606,6 @@ static int daqboard2000_upload_firmware(struct comedi_device *dev) static void daqboard2000_adcStopDmaTransfer(struct comedi_device *dev) { -/* printk("Implement: daqboard2000_adcStopDmaTransfer\n");*/ } static void daqboard2000_adcDisarm(struct comedi_device *dev) @@ -648,7 +646,6 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev) break; udelay(2); } -/* printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/ /* Set the - reference dac value in the FPGA */ writew(0x80 | DAQBOARD2000_NegRefDacSelect, devpriv->daq + refDacs); @@ -658,22 +655,18 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev) break; udelay(2); } -/* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/ } static void daqboard2000_initializeCtrs(struct comedi_device *dev) { -/* printk("Implement: daqboard2000_initializeCtrs\n");*/ } static void daqboard2000_initializeTmrs(struct comedi_device *dev) { -/* printk("Implement: daqboard2000_initializeTmrs\n");*/ } static void daqboard2000_dacDisarm(struct comedi_device *dev) { -/* printk("Implement: daqboard2000_dacDisarm\n");*/ } static void daqboard2000_initializeAdc(struct comedi_device *dev) @@ -768,24 +761,12 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, readl(devpriv->plx + 0x6c); - /* - u8 interrupt; - Windows code does restore interrupts, but since we don't use them... - pci_read_config_byte(pcidev, PCI_INTERRUPT_LINE, &interrupt); - printk("Interrupt before is: %x\n", interrupt); - */ - result = daqboard2000_upload_firmware(dev); if (result < 0) return result; daqboard2000_initializeAdc(dev); daqboard2000_initializeDac(dev); - /* - Windows code does restore interrupts, but since we don't use them... - pci_read_config_byte(pcidev, PCI_INTERRUPT_LINE, &interrupt); - printk("Interrupt after is: %x\n", interrupt); - */ s = &dev->subdevices[0]; /* ai subdevice */