From dbd92ccf4301e46165bb08cf2a4b8d6831f02b4a Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Wed, 22 Aug 2012 15:48:59 +0530
Subject: [PATCH] --- yaml --- r: 325887 b: refs/heads/master c:
 c2892cd4d9251d62419b731816633b9041fa7e3c h: refs/heads/master i:   325885:
 bb8c7da44221efd062e027e3ac23d2929b773b62   325883:
 66abf88a1f7b132182a9d5e09b0bae88b3cafa86   325879:
 2596fd630a7c5d6e89acd224b097e015529b9b5c   325871:
 f60d7fde4c73be82acbcaf6c9a1eec4f1417126b   325855:
 602bfb87fc09d6478ea6b43b94fa0b31481fd66f   325823:
 03fb2b4eb5ba2ce149f0a821c12fa1642388a734   325759:
 8d713cdf49df1f3dea62ee70c97ed5ebea5d61ef   325631:
 5c660b610b258c62739e58ceb18d238d19932b36 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/usb/gadget/s3c2410_udc.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3ca7cb97af78..8811cc3cb169 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8e25b882f8077c5fb38c111c0cb0fb079fb62d
+refs/heads/master: c2892cd4d9251d62419b731816633b9041fa7e3c
diff --git a/trunk/drivers/usb/gadget/s3c2410_udc.c b/trunk/drivers/usb/gadget/s3c2410_udc.c
index 7acecc0acf18..55a571e15cd2 100644
--- a/trunk/drivers/usb/gadget/s3c2410_udc.c
+++ b/trunk/drivers/usb/gadget/s3c2410_udc.c
@@ -12,6 +12,8 @@
  * (at your option) any later version.
  */
 
+#define pr_fmt(fmt) "s3c2410_udc: " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -115,7 +117,7 @@ static int dprintk(int level, const char *fmt, ...)
 			sizeof(printk_buf)-len, fmt, args);
 	va_end(args);
 
-	return printk(KERN_DEBUG "%s", printk_buf);
+	return pr_debug("%s", printk_buf);
 }
 #else
 static int dprintk(int level, const char *fmt, ...)
@@ -1683,13 +1685,13 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver,
 		return -EBUSY;
 
 	if (!bind || !driver->setup || driver->max_speed < USB_SPEED_FULL) {
-		printk(KERN_ERR "Invalid driver: bind %p setup %p speed %d\n",
+		dev_err(&udc->gadget.dev, "Invalid driver: bind %p setup %p speed %d\n",
 			bind, driver->setup, driver->max_speed);
 		return -EINVAL;
 	}
 #if defined(MODULE)
 	if (!driver->unbind) {
-		printk(KERN_ERR "Invalid driver: no unbind method\n");
+		dev_err(&udc->gadget.dev, "Invalid driver: no unbind method\n");
 		return -EINVAL;
 	}
 #endif
@@ -1700,7 +1702,7 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver,
 
 	/* Bind the driver */
 	if ((retval = device_add(&udc->gadget.dev)) != 0) {
-		printk(KERN_ERR "Error in device_add() : %d\n",retval);
+		dev_err(&udc->gadget.dev, "Error in device_add() : %d\n", retval);
 		goto register_error;
 	}
 
@@ -2073,7 +2075,7 @@ static int __init udc_init(void)
 
 	s3c2410_udc_debugfs_root = debugfs_create_dir(gadget_name, NULL);
 	if (IS_ERR(s3c2410_udc_debugfs_root)) {
-		printk(KERN_ERR "%s: debugfs dir creation failed %ld\n",
+		pr_err("%s: debugfs dir creation failed %ld\n",
 			gadget_name, PTR_ERR(s3c2410_udc_debugfs_root));
 		s3c2410_udc_debugfs_root = NULL;
 	}