linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/6] Staging: comedi: fix printk warning issue in ni_at_a2150.c
@ 2012-01-02 13:09 Ravishankar karkala Mallikarjunayya
  2012-01-02 13:09 ` [PATCH 2/6] Staging: comedi: fix printk warning issue in dt2801.c Ravishankar karkala Mallikarjunayya
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2012-01-02 13:09 UTC (permalink / raw)
  To: gregkh, wfp5p
  Cc: devel, linux-kernel, dan.carpenter, rmallon, joe,
	valdis.kletnieks, jj, Ravishankar karkala Mallikarjunayya

This patch fixes a printk warning found by the checkpatch.pl tool.
Convert printk messages to dev_<levels> and removes useless printk
messages.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
 drivers/staging/comedi/drivers/ni_at_a2150.c |   48 ++++++--------------------
 1 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index c25e44c..ee888bd 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -215,9 +215,10 @@ module_exit(driver_a2150_cleanup_module);
 
 static void ni_dump_regs(struct comedi_device *dev)
 {
-	printk("config bits 0x%x\n", devpriv->config_bits);
-	printk("irq dma bits 0x%x\n", devpriv->irq_dma_bits);
-	printk("status bits 0x%x\n", inw(dev->iobase + STATUS_REG));
+	dev_dbg(dev->hw_dev, "config bits 0x%x\n", devpriv->config_bits);
+	dev_dbg(dev->hw_dev, "irq dma bits 0x%x\n", devpriv->irq_dma_bits);
+	dev_dbg(dev->hw_dev, "status bits 0x%x\n",
+		inw(dev->iobase + STATUS_REG));
 }
 
 #endif
@@ -347,61 +348,35 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	static const int timeout = 2000;
 	int i;
 
-	printk("comedi%d: %s: io 0x%lx", dev->minor, driver_a2150.driver_name,
-	       iobase);
-	if (irq) {
-		printk(", irq %u", irq);
-	} else {
-		printk(", no irq");
-	}
-	if (dma) {
-		printk(", dma %u", dma);
-	} else {
-		printk(", no dma");
-	}
-	printk("\n");
-
 	/* allocate and initialize dev->private */
 	if (alloc_private(dev, sizeof(struct a2150_private)) < 0)
 		return -ENOMEM;
 
-	if (iobase == 0) {
-		printk(" io base address required\n");
+	if (iobase == 0)
 		return -EINVAL;
-	}
 
 	/* check if io addresses are available */
-	if (!request_region(iobase, A2150_SIZE, driver_a2150.driver_name)) {
-		printk(" I/O port conflict\n");
+	if (!request_region(iobase, A2150_SIZE, driver_a2150.driver_name))
 		return -EIO;
-	}
 	dev->iobase = iobase;
 
 	/* grab our IRQ */
 	if (irq) {
 		/*  check that irq is supported */
-		if (irq < 3 || irq == 8 || irq == 13 || irq > 15) {
-			printk(" invalid irq line %u\n", irq);
+		if (irq < 3 || irq == 8 || irq == 13 || irq > 15)
 			return -EINVAL;
-		}
 		if (request_irq(irq, a2150_interrupt, 0,
-				driver_a2150.driver_name, dev)) {
-			printk("unable to allocate irq %u\n", irq);
+					driver_a2150.driver_name, dev))
 			return -EINVAL;
-		}
 		devpriv->irq_dma_bits |= IRQ_LVL_BITS(irq);
 		dev->irq = irq;
 	}
 	/*  initialize dma */
 	if (dma) {
-		if (dma == 4 || dma > 7) {
-			printk(" invalid dma channel %u\n", dma);
+		if (dma == 4 || dma > 7)
 			return -EINVAL;
-		}
-		if (request_dma(dma, driver_a2150.driver_name)) {
-			printk(" failed to allocate dma channel %u\n", dma);
+		if (request_dma(dma, driver_a2150.driver_name))
 			return -EINVAL;
-		}
 		devpriv->dma = dma;
 		devpriv->dma_buffer =
 		    kmalloc(A2150_DMA_BUFFER_SIZE, GFP_KERNEL | GFP_DMA);
@@ -466,7 +441,6 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int a2150_detach(struct comedi_device *dev)
 {
-	printk("comedi%d: %s: remove\n", dev->minor, driver_a2150.driver_name);
 
 	/* only free stuff if it has been allocated by _attach */
 	if (dev->iobase) {
@@ -801,7 +775,7 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 #endif
 		data[n] = inw(dev->iobase + FIFO_DATA_REG);
 #ifdef A2150_DEBUG
-		printk(" data is %i\n", data[n]);
+		dev_dbg(dev->hw_dev, "data is %i\n", data[n]);
 #endif
 		data[n] ^= 0x8000;
 	}
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/6] Staging: comedi: fix printk warning issue in dt2801.c
  2012-01-02 13:09 [PATCH 1/6] Staging: comedi: fix printk warning issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
@ 2012-01-02 13:09 ` Ravishankar karkala Mallikarjunayya
  2012-01-02 13:09 ` [PATCH 3/6] Staging: comedi: fix printk warning issue in contec_pci_dio.c Ravishankar karkala Mallikarjunayya
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2012-01-02 13:09 UTC (permalink / raw)
  To: gregkh, wfp5p
  Cc: devel, linux-kernel, dan.carpenter, rmallon, joe,
	valdis.kletnieks, jj, Ravishankar karkala Mallikarjunayya

This patch fixes a printk warning issue found by the checkpatch.pl
tool.
Convert printk messages to dev_<levels> and removes useless printk
messages.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
 drivers/staging/comedi/drivers/dt2801.c |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c
index 5cce1b5..9f07365 100644
--- a/drivers/staging/comedi/drivers/dt2801.c
+++ b/drivers/staging/comedi/drivers/dt2801.c
@@ -424,7 +424,8 @@ static int dt2801_reset(struct comedi_device *dev)
 			break;
 	} while (timeout--);
 	if (!timeout)
-		printk("dt2801: timeout 1 status=0x%02x\n", stat);
+		dev_dbg(dev->hw_dev, "dt2801: timeout 1 status=0x%02x\n",
+			stat);
 
 	/* printk("dt2801: reading dummy\n"); */
 	/* dt2801_readdata(dev,&board_code); */
@@ -441,7 +442,8 @@ static int dt2801_reset(struct comedi_device *dev)
 			break;
 	} while (timeout--);
 	if (!timeout)
-		printk("dt2801: timeout 2 status=0x%02x\n", stat);
+		dev_dbg(dev->hw_dev, "dt2801: timeout 2 status=0x%02x\n",
+			stat);
 
 	DPRINTK("dt2801: reading code\n");
 	dt2801_readdata(dev, &board_code);
@@ -521,10 +523,8 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	int n_ai_chans;
 
 	iobase = it->options[0];
-	if (!request_region(iobase, DT2801_IOSIZE, "dt2801")) {
-		comedi_error(dev, "I/O port conflict");
+	if (!request_region(iobase, DT2801_IOSIZE, "dt2801"))
 		return -EIO;
-	}
 	dev->iobase = iobase;
 
 	/* do some checking */
@@ -539,16 +539,13 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		if (boardtypes[type].boardcode == board_code)
 			goto havetype;
 	}
-	printk("dt2801: unrecognized board code=0x%02x, contact author\n",
-	       board_code);
+	dev_warn(dev->hw_dev, "dt2801: unrecognized board code=0x%02x, contact author\n",
+		 board_code);
 	type = 0;
 
 havetype:
 	dev->board_ptr = boardtypes + type;
-	printk("dt2801: %s at port 0x%lx", boardtype.name, iobase);
-
 	n_ai_chans = probe_number_of_ai_chans(dev);
-	printk(" (ai channels = %d)", n_ai_chans);
 
 	ret = alloc_subdevices(dev, 4);
 	if (ret < 0)
@@ -610,7 +607,6 @@ havetype:
 
 	ret = 0;
 out:
-	printk("\n");
 
 	return ret;
 }
@@ -627,12 +623,13 @@ static int dt2801_error(struct comedi_device *dev, int stat)
 {
 	if (stat < 0) {
 		if (stat == -ETIME)
-			printk("dt2801: timeout\n");
+			dev_err(dev->hw_dev, "dt2801: timeout\n");
 		else
-			printk("dt2801: error %d\n", stat);
+			dev_err(dev->hw_dev, "dt2801: error %d\n", stat);
 		return stat;
 	}
-	printk("dt2801: error status 0x%02x, resetting...\n", stat);
+	dev_err(dev->hw_dev, "dt2801: error status 0x%02x, resetting...\n",
+		stat);
 
 	dt2801_reset(dev);
 	dt2801_reset(dev);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/6] Staging: comedi: fix printk warning issue in contec_pci_dio.c
  2012-01-02 13:09 [PATCH 1/6] Staging: comedi: fix printk warning issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
  2012-01-02 13:09 ` [PATCH 2/6] Staging: comedi: fix printk warning issue in dt2801.c Ravishankar karkala Mallikarjunayya
@ 2012-01-02 13:09 ` Ravishankar karkala Mallikarjunayya
  2012-01-02 13:10 ` [PATCH 4/6] Staging: comedi: fix printk warning issue in amplc_pci230.c Ravishankar karkala Mallikarjunayya
  2012-01-02 13:10 ` [PATCH 5/6] Staging: comedi: fix line over 80 character issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
  3 siblings, 0 replies; 6+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2012-01-02 13:09 UTC (permalink / raw)
  To: gregkh, wfp5p
  Cc: devel, linux-kernel, dan.carpenter, rmallon, joe,
	valdis.kletnieks, jj, Ravishankar karkala Mallikarjunayya

This patch removes useless printk().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
 drivers/staging/comedi/drivers/contec_pci_dio.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index e3659bd..4767717 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -105,8 +105,6 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	struct pci_dev *pcidev = NULL;
 	struct comedi_subdevice *s;
 
-	printk("comedi%d: contec: ", dev->minor);
-
 	dev->board_name = thisboard->name;
 
 	if (alloc_private(dev, sizeof(struct contec_private)) < 0)
@@ -132,8 +130,6 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 				return -EIO;
 			}
 			dev->iobase = pci_resource_start(pcidev, 0);
-			printk(" base addr %lx ", dev->iobase);
-
 			dev->board_ptr = contec_boards + 0;
 
 			s = dev->subdevices + 0;
@@ -153,20 +149,16 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 			s->range_table = &range_digital;
 			s->insn_bits = contec_do_insn_bits;
 
-			printk("attached\n");
 
 			return 1;
 		}
 	}
 
-	printk("card not present!\n");
-
 	return -EIO;
 }
 
 static int contec_detach(struct comedi_device *dev)
 {
-	printk("comedi%d: contec: remove\n", dev->minor);
 
 	if (devpriv && devpriv->pci_dev) {
 		if (dev->iobase)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/6] Staging: comedi: fix printk warning issue in amplc_pci230.c
  2012-01-02 13:09 [PATCH 1/6] Staging: comedi: fix printk warning issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
  2012-01-02 13:09 ` [PATCH 2/6] Staging: comedi: fix printk warning issue in dt2801.c Ravishankar karkala Mallikarjunayya
  2012-01-02 13:09 ` [PATCH 3/6] Staging: comedi: fix printk warning issue in contec_pci_dio.c Ravishankar karkala Mallikarjunayya
@ 2012-01-02 13:10 ` Ravishankar karkala Mallikarjunayya
  2012-01-02 13:10 ` [PATCH 5/6] Staging: comedi: fix line over 80 character issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
  3 siblings, 0 replies; 6+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2012-01-02 13:10 UTC (permalink / raw)
  To: gregkh, wfp5p
  Cc: devel, linux-kernel, dan.carpenter, rmallon, joe,
	valdis.kletnieks, jj, Ravishankar karkala Mallikarjunayya

This patch fixes a printk warning found by the checkpatch.pl tool.
Convert printk messages to dev_<levels> and removes useless
printk messages.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
 drivers/staging/comedi/drivers/amplc_pci230.c |   37 +++++++-----------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 5389795..eec361a 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -764,8 +764,9 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	struct pci_dev *pci_dev = NULL;
 	int i = 0, irq_hdl, rc;
 
-	printk("comedi%d: amplc_pci230: attach %s %d,%d\n", dev->minor,
-	       thisboard->name, it->options[0], it->options[1]);
+	dev_info(dev->hw_dev, "comedi%d: amplc_pci230: attach %s %d,%d\n",
+		 dev->minor, thisboard->name, it->options[0],
+		 it->options[1]);
 
 	/* Allocate the private structure area using alloc_private().
 	 * Macro defined in comedidev.h - memsets struct fields to 0. */
@@ -838,11 +839,8 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 			}
 		}
 	}
-	if (!pci_dev) {
-		printk("comedi%d: No %s card found\n", dev->minor,
-		       thisboard->name);
+	if (!pci_dev)
 		return -EIO;
-	}
 	devpriv->pci_dev = pci_dev;
 
 	/*
@@ -851,20 +849,14 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	dev->board_name = thisboard->name;
 
 	/* Enable PCI device and reserve I/O spaces. */
-	if (comedi_pci_enable(pci_dev, "amplc_pci230") < 0) {
-		printk("comedi%d: failed to enable PCI device "
-		       "and request regions\n", dev->minor);
+	if (comedi_pci_enable(pci_dev, "amplc_pci230") < 0)
 		return -EIO;
-	}
 
 	/* Read base addresses of the PCI230's two I/O regions from PCI
 	 * configuration register. */
 	iobase1 = pci_resource_start(pci_dev, 2);
 	iobase2 = pci_resource_start(pci_dev, 3);
 
-	printk("comedi%d: %s I/O region 1 0x%04lx I/O region 2 0x%04lx\n",
-	       dev->minor, dev->board_name, iobase1, iobase2);
-
 	devpriv->iobase1 = iobase1;
 	dev->iobase = iobase2;
 
@@ -877,13 +869,8 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		unsigned short extfunc = 0;
 
 		devpriv->hwver = inw(dev->iobase + PCI230P_HWVER);
-		if (devpriv->hwver < thisboard->min_hwver) {
-			printk("comedi%d: %s - bad hardware version "
-			       "- got %u, need %u\n", dev->minor,
-			       dev->board_name, devpriv->hwver,
-			       thisboard->min_hwver);
+		if (devpriv->hwver < thisboard->min_hwver)
 			return -EIO;
-		}
 		if (devpriv->hwver > 0) {
 			if (!thisboard->have_dio) {
 				/* No DIO ports.  Route counters' external gates
@@ -929,13 +916,12 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	irq_hdl = request_irq(devpriv->pci_dev->irq, pci230_interrupt,
 			      IRQF_SHARED, "amplc_pci230", dev);
 	if (irq_hdl < 0) {
-		printk("comedi%d: unable to register irq, "
-		       "commands will not be available %d\n", dev->minor,
-		       devpriv->pci_dev->irq);
+		dev_warn(dev->hw_dev, "comedi%d: unable to register irq, commands will not be available %d\n",
+			 dev->minor, devpriv->pci_dev->irq);
 	} else {
 		dev->irq = devpriv->pci_dev->irq;
-		printk("comedi%d: registered irq %u\n", dev->minor,
-		       devpriv->pci_dev->irq);
+		dev_dbg(dev->hw_dev, "comedi%d: registered irq %u\n",
+			dev->minor, devpriv->pci_dev->irq);
 	}
 
 	/*
@@ -998,7 +984,6 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		s->type = COMEDI_SUBD_UNUSED;
 	}
 
-	printk("comedi%d: attached\n", dev->minor);
 
 	return 1;
 }
@@ -1013,7 +998,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  */
 static int pci230_detach(struct comedi_device *dev)
 {
-	printk("comedi%d: amplc_pci230: remove\n", dev->minor);
+	dev_info(dev->hw_dev, "comedi%d: amplc_pci230: remove\n", dev->minor);
 
 	if (dev->subdevices && thisboard->have_dio)
 		/* Clean up dio subdevice. */
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 5/6] Staging: comedi: fix line over 80 character issue in daqboard2000.c
  2012-01-02 13:09 [PATCH 1/6] Staging: comedi: fix printk warning issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
                   ` (2 preceding siblings ...)
  2012-01-02 13:10 ` [PATCH 4/6] Staging: comedi: fix printk warning issue in amplc_pci230.c Ravishankar karkala Mallikarjunayya
@ 2012-01-02 13:10 ` Ravishankar karkala Mallikarjunayya
  2012-01-02 20:47   ` Ryan Mallon
  3 siblings, 1 reply; 6+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2012-01-02 13:10 UTC (permalink / raw)
  To: gregkh, wfp5p
  Cc: devel, linux-kernel, dan.carpenter, rmallon, joe,
	valdis.kletnieks, jj, Ravishankar karkala Mallikarjunayya

This is a patch to the daqboard2000.c file that fixes up a
line over 80 character warning found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
 drivers/staging/comedi/drivers/daqboard2000.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index e61c6a8..3550c6a 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -414,7 +414,7 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
 
 	/* If pacer clock is not set to some high value (> 10 us), we
 	   risk multiple samples to be put into the result FIFO. */
-	fpga->acqPacerClockDivLow = 1000000;	/* 1 second, should be long enough */
+	/* 1 second, should be long enough */
 	fpga->acqPacerClockDivHigh = 0;
 
 	gain = CR_RANGE(insn->chanspec);
@@ -526,7 +526,8 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev)
 	writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
 	udelay(10000);
 	writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);
-	udelay(10000);		/* Not in the original code, but I like symmetry... */
+	/* Not in the original code, but I like symmetry... */
+	udelay(10000);
 }
 
 static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 5/6] Staging: comedi: fix line over 80 character issue in daqboard2000.c
  2012-01-02 13:10 ` [PATCH 5/6] Staging: comedi: fix line over 80 character issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
@ 2012-01-02 20:47   ` Ryan Mallon
  0 siblings, 0 replies; 6+ messages in thread
From: Ryan Mallon @ 2012-01-02 20:47 UTC (permalink / raw)
  To: Ravishankar karkala Mallikarjunayya
  Cc: gregkh, wfp5p, devel, linux-kernel, dan.carpenter, joe,
	valdis.kletnieks, jj

On 03/01/12 00:10, Ravishankar karkala Mallikarjunayya wrote:
> This is a patch to the daqboard2000.c file that fixes up a
> line over 80 character warning found by the checkpatch.pl tool.
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
> ---
>  drivers/staging/comedi/drivers/daqboard2000.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
> index e61c6a8..3550c6a 100644
> --- a/drivers/staging/comedi/drivers/daqboard2000.c
> +++ b/drivers/staging/comedi/drivers/daqboard2000.c
> @@ -414,7 +414,7 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
>  
>  	/* If pacer clock is not set to some high value (> 10 us), we
>  	   risk multiple samples to be put into the result FIFO. */
> -	fpga->acqPacerClockDivLow = 1000000;	/* 1 second, should be long enough */
> +	/* 1 second, should be long enough */

You broke the driver here.

>  	fpga->acqPacerClockDivHigh = 0;
>  
>  	gain = CR_RANGE(insn->chanspec);
> @@ -526,7 +526,8 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev)
>  	writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
>  	udelay(10000);
>  	writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);
> -	udelay(10000);		/* Not in the original code, but I like symmetry... */
> +	/* Not in the original code, but I like symmetry... */
> +	udelay(10000);
>  }
>  
>  static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-01-02 20:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-02 13:09 [PATCH 1/6] Staging: comedi: fix printk warning issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
2012-01-02 13:09 ` [PATCH 2/6] Staging: comedi: fix printk warning issue in dt2801.c Ravishankar karkala Mallikarjunayya
2012-01-02 13:09 ` [PATCH 3/6] Staging: comedi: fix printk warning issue in contec_pci_dio.c Ravishankar karkala Mallikarjunayya
2012-01-02 13:10 ` [PATCH 4/6] Staging: comedi: fix printk warning issue in amplc_pci230.c Ravishankar karkala Mallikarjunayya
2012-01-02 13:10 ` [PATCH 5/6] Staging: comedi: fix line over 80 character issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
2012-01-02 20:47   ` Ryan Mallon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).