From dacb1c7f8504412c017babdd38b34e834f719af9 Mon Sep 17 00:00:00 2001
From: YAMANE Toshiaki <yamanetoshi@gmail.com>
Date: Thu, 25 Oct 2012 09:16:49 +0900
Subject: [PATCH] --- yaml --- r: 337280 b: refs/heads/master c:
 4f72b738b1c8a9502a297f998b83ffae0815024b h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/comedi/drivers/serial2002.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e606e839af5c..6d5f5a141e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2847ff5d1b63496c2e3eedb8efad2752cc2e195d
+refs/heads/master: 4f72b738b1c8a9502a297f998b83ffae0815024b
diff --git a/trunk/drivers/staging/comedi/drivers/serial2002.c b/trunk/drivers/staging/comedi/drivers/serial2002.c
index 4b3b9b029476..e6177b48ccaf 100644
--- a/trunk/drivers/staging/comedi/drivers/serial2002.c
+++ b/trunk/drivers/staging/comedi/drivers/serial2002.c
@@ -31,6 +31,8 @@ Status: in development
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../comedidev.h"
 
 #include <linux/delay.h>
@@ -272,7 +274,7 @@ static struct serial_data serial_read(struct file *f, int timeout)
 
 		length++;
 		if (data < 0) {
-			printk(KERN_ERR "serial2002 error\n");
+			pr_err("Failed to read serial.\n");
 			break;
 		} else if (data & 0x80) {
 			result.value = (result.value << 7) | (data & 0x7f);
@@ -346,7 +348,7 @@ static int serial_2002_open(struct comedi_device *dev)
 	devpriv->tty = filp_open(port, O_RDWR, 0);
 	if (IS_ERR(devpriv->tty)) {
 		result = (int)PTR_ERR(devpriv->tty);
-		printk(KERN_ERR "serial_2002: file open error = %d\n", result);
+		dev_err(dev->class_dev, "file open error = %d\n", result);
 	} else {
 		struct config_t {