Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281112
b: refs/heads/master
c: c62a0ef
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 2bd85ac commit 992f5e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 26ba666c50a9a7883e837626d85dc71c30b28b77
refs/heads/master: c62a0ef42c119f6c36d6f228839e0f3aafba0dca
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/pcl818.c
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
int divisor1 = 0, divisor2 = 0;
unsigned int seglen;

printk("pcl818_ai_cmd_mode()\n");
dev_dbg(dev->hw_dev, "pcl818_ai_cmd_mode()\n");
if ((!dev->irq) && (!devpriv->dma_rtc)) {
comedi_error(dev, "IRQ not defined!");
return -EINVAL;
Expand Down Expand Up @@ -1110,7 +1110,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
break;
}
#endif
printk("pcl818_ai_cmd_mode() end\n");
dev_dbg(dev->hw_dev, "pcl818_ai_cmd_mode() end\n");
return 0;
}

Expand Down Expand Up @@ -1453,7 +1453,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
struct comedi_cmd *cmd = &s->async->cmd;
int retval;

printk("pcl818_ai_cmd()\n");
dev_dbg(dev->hw_dev, "pcl818_ai_cmd()\n");
devpriv->ai_n_chan = cmd->chanlist_len;
devpriv->ai_chanlist = cmd->chanlist;
devpriv->ai_flags = cmd->flags;
Expand All @@ -1471,7 +1471,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
if (cmd->convert_src == TRIG_TIMER) { /* mode 1 */
devpriv->ai_timer1 = cmd->convert_arg;
retval = pcl818_ai_cmd_mode(1, dev, s);
printk("pcl818_ai_cmd() end\n");
dev_dbg(dev->hw_dev, "pcl818_ai_cmd() end\n");
return retval;
}
if (cmd->convert_src == TRIG_EXT) { /* mode 3 */
Expand All @@ -1490,7 +1490,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,
struct comedi_subdevice *s)
{
if (devpriv->irq_blocked > 0) {
printk("pcl818_ai_cancel()\n");
dev_dbg(dev->hw_dev, "pcl818_ai_cancel()\n");
devpriv->irq_was_now_closed = 1;

switch (devpriv->ai_mode) {
Expand Down Expand Up @@ -1540,7 +1540,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,
}

end:
printk("pcl818_ai_cancel() end\n");
dev_dbg(dev->hw_dev, "pcl818_ai_cancel() end\n");
return 0;
}

Expand Down

0 comments on commit 992f5e5

Please sign in to comment.