summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Southwood <chase.southwood@yahoo.com>2014-02-19 11:37:54 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-22 00:38:09 +0400
commit614bd02fc0113c5b272843731f69005484c77e2a (patch)
treef4f3f5f2e5379f8b61c2ef91ecca4b8d4098463d
parent988bcffd2632c29d1b1bacf686989b1191dd137d (diff)
downloadlinux-614bd02fc0113c5b272843731f69005484c77e2a.tar.xz
Staging: comedi: addi-data: replace printk() with dev_err() in hwdrv_apci1564.c
There were a small handful of printk() calls in hwdrv_apci1564.c. It is generally better to use dev_err() for error messages instead, so I switched all the printk() calls out, as well as cleaned up the error strings. Signed-off-by: Chase Southwood <chase.southwood@yahoo.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 66e6e68ee3d7..21dd028c4461 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -414,7 +414,7 @@ static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
devpriv->iobase + ((data[5] - 1) * 0x20) +
APCI1564_TCW_PROG);
} else {
- printk(" Invalid subdevice.");
+ dev_err(dev->class_dev, "Invalid subdevice.\n");
}
return insn->n;
@@ -472,7 +472,7 @@ static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
APCI1564_TCW_PROG);
break;
default:
- printk("\nSpecified functionality does not exist\n");
+ dev_err(dev->class_dev, "Specified functionality does not exist.\n");
return -EINVAL;
}
}
@@ -591,7 +591,7 @@ static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
} else if ((devpriv->b_TimerSelectMode != ADDIDATA_TIMER)
&& (devpriv->b_TimerSelectMode != ADDIDATA_WATCHDOG)
&& (devpriv->b_TimerSelectMode != ADDIDATA_COUNTER)) {
- printk("\n Invalid Subdevice !!!\n");
+ dev_err(dev->class_dev, "Invalid Subdevice!\n");
}
return insn->n;
}
@@ -665,7 +665,7 @@ static void v_APCI1564_Interrupt(int irq, void *d)
APCI1564_TCW_IRQ) & 0x1;
if (ui_DI == 0 && ui_DO == 0 && ui_Timer == 0 && ui_C1 == 0
&& ui_C2 == 0 && ui_C3 == 0 && ui_C4 == 0) {
- printk("\nInterrupt from unknown source\n");
+ dev_err(dev->class_dev, "Interrupt from unknown source.\n");
}
if (ui_DI == 1) {