From 8f9bbdd1d088a0a3fbe11ac30384a79427485c59 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Apr 2012 14:34:49 -0700
Subject: [PATCH] --- yaml --- r: 303610 b: refs/heads/master c:
 7b22a8855a727c5d8265508cbba05437a68f7043 h: refs/heads/master v: v3

---
 [refs]                                               |  2 +-
 trunk/drivers/input/joystick/iforce/iforce-main.c    |  3 ++-
 trunk/drivers/input/joystick/iforce/iforce-packets.c | 10 +++++++---
 trunk/drivers/input/joystick/iforce/iforce-usb.c     |  5 +++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 93b62726938f..76165b34b3d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9451df0ee893dbdfca626f2888654f321d241460
+refs/heads/master: 7b22a8855a727c5d8265508cbba05437a68f7043
diff --git a/trunk/drivers/input/joystick/iforce/iforce-main.c b/trunk/drivers/input/joystick/iforce/iforce-main.c
index 405febd94f24..daeeb4c7e3b0 100644
--- a/trunk/drivers/input/joystick/iforce/iforce-main.c
+++ b/trunk/drivers/input/joystick/iforce/iforce-main.c
@@ -317,7 +317,8 @@ int iforce_init_device(struct iforce *iforce)
 			break;
 
 	if (i == 20) { /* 5 seconds */
-		err("Timeout waiting for response from device.");
+		dev_err(&input_dev->dev,
+			"Timeout waiting for response from device.\n");
 		error = -ENODEV;
 		goto fail;
 	}
diff --git a/trunk/drivers/input/joystick/iforce/iforce-packets.c b/trunk/drivers/input/joystick/iforce/iforce-packets.c
index a17b50016009..137326a5c2aa 100644
--- a/trunk/drivers/input/joystick/iforce/iforce-packets.c
+++ b/trunk/drivers/input/joystick/iforce/iforce-packets.c
@@ -257,7 +257,8 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 
 		status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC);
 		if (status) {
-			err("usb_submit_urb failed %d", status);
+			dev_err(&iforce->usbdev->dev,
+				"usb_submit_urb failed %d\n", status);
 			return -1;
 		}
 
@@ -289,12 +290,15 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 			return -1;
 		}
 #else
-		err("iforce_get_id_packet: iforce->bus = SERIO!");
+		dev_err(&iforce->dev->dev,
+			"iforce_get_id_packet: iforce->bus = SERIO!\n");
 #endif
 		break;
 
 	default:
-		err("iforce_get_id_packet: iforce->bus = %d", iforce->bus);
+		dev_err(&iforce->dev->dev,
+			"iforce_get_id_packet: iforce->bus = %d\n",
+			iforce->bus);
 		break;
 	}
 
diff --git a/trunk/drivers/input/joystick/iforce/iforce-usb.c b/trunk/drivers/input/joystick/iforce/iforce-usb.c
index 6c96631ae5d9..ecbfae7d7539 100644
--- a/trunk/drivers/input/joystick/iforce/iforce-usb.c
+++ b/trunk/drivers/input/joystick/iforce/iforce-usb.c
@@ -100,8 +100,9 @@ static void iforce_usb_irq(struct urb *urb)
 exit:
 	status = usb_submit_urb (urb, GFP_ATOMIC);
 	if (status)
-		err ("%s - usb_submit_urb failed with result %d",
-		     __func__, status);
+		dev_err(&iforce->usbdev->dev,
+			"%s - usb_submit_urb failed with result %d\n",
+			__func__, status);
 }
 
 static void iforce_usb_out(struct urb *urb)