From 92d31099790035c3fa24b3683184deb99484c42f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Sep 2012 19:00:11 -0700 Subject: [PATCH] --- yaml --- r: 325132 b: refs/heads/master c: 1fbc937b240db5e54be3cfa147d7efb4d72b6a1d h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/adl_pci9111.c | 28 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/[refs] b/[refs] index a617d4573c79..5843fbcf036a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e5a0ba03e2f0d7402e47620ce0fae71b44e4723 +refs/heads/master: 1fbc937b240db5e54be3cfa147d7efb4d72b6a1d diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 0c20c8dead12..f9d874bb8c4b 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -375,8 +375,6 @@ static void pci9111_interrupt_source_set(struct comedi_device *dev, /* Cancel analog input autoscan */ -#undef AI_DO_CMD_DEBUG - static int pci9111_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) { @@ -393,10 +391,6 @@ static int pci9111_ai_cancel(struct comedi_device *dev, pci9111_fifo_reset(); -#ifdef AI_DO_CMD_DEBUG - printk(PCI9111_DRIVER_NAME ": ai_cancel\n"); -#endif - return 0; } @@ -650,11 +644,6 @@ static int pci9111_ai_do_cmd(struct comedi_device *dev, &(async_cmd->convert_arg), async_cmd-> flags & TRIG_ROUND_MASK); -#ifdef AI_DO_CMD_DEBUG - printk(PCI9111_DRIVER_NAME ": divisors = %d, %d\n", - dev_private->timer_divisor_1, - dev_private->timer_divisor_2); -#endif pci9111_trigger_source_set(dev, software); pci9111_timer_set(dev); @@ -696,23 +685,6 @@ static int pci9111_ai_do_cmd(struct comedi_device *dev, dev_private->chunk_num_samples = dev_private->chanlist_len * (1 + dev_private->scan_delay); -#ifdef AI_DO_CMD_DEBUG - printk(PCI9111_DRIVER_NAME ": start interruptions!\n"); - printk(PCI9111_DRIVER_NAME ": trigger source = %2x\n", - pci9111_trigger_and_autoscan_get()); - printk(PCI9111_DRIVER_NAME ": irq source = %2x\n", - pci9111_interrupt_and_fifo_get()); - printk(PCI9111_DRIVER_NAME ": ai_do_cmd\n"); - printk(PCI9111_DRIVER_NAME ": stop counter = %d\n", - dev_private->stop_counter); - printk(PCI9111_DRIVER_NAME ": scan delay = %d\n", - dev_private->scan_delay); - printk(PCI9111_DRIVER_NAME ": chanlist_len = %d\n", - dev_private->chanlist_len); - printk(PCI9111_DRIVER_NAME ": chunk num samples = %d\n", - dev_private->chunk_num_samples); -#endif - return 0; }