Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325132
b: refs/heads/master
c: 1fbc937
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 129d1c8 commit 92d3109
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e5a0ba03e2f0d7402e47620ce0fae71b44e4723
refs/heads/master: 1fbc937b240db5e54be3cfa147d7efb4d72b6a1d
28 changes: 0 additions & 28 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 92d3109

Please sign in to comment.