Jesse Keating 7a3296
From: Peter Jones <pjones@redhat.com>
Jesse Keating 7a3296
Date: Thu, 25 Sep 2008 16:23:33 -0400
6a9155
Subject: [PATCH] input: silence i8042 noise
Jesse Keating 7a3296
6a9155
Don't print an error message just because there's no i8042 chip.
Jesse Keating 7a3296
Some systems, such as EFI-based Apple systems, won't necessarily have an
Jesse Keating 7a3296
i8042 to initialize.  We shouldn't be printing an error message in this
Jesse Keating 7a3296
case, since not detecting the chip is the correct behavior.
6a9155
6a9155
Bugzilla: N/A
6a9155
Upstream-status: Fedora mustard
Jesse Keating 7a3296
---
6a9155
 drivers/base/power/main.c   | 2 --
6a9155
 drivers/input/serio/i8042.c | 1 -
6a9155
 net/can/af_can.c            | 8 ++------
6a9155
 3 files changed, 2 insertions(+), 9 deletions(-)
6a9155
6a9155
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
35eff4
index 30b7bbfdc558..95863902627f 100644
6a9155
--- a/drivers/base/power/main.c
6a9155
+++ b/drivers/base/power/main.c
35eff4
@@ -123,8 +123,6 @@ void device_pm_unlock(void)
6a9155
  */
6a9155
 void device_pm_add(struct device *dev)
6a9155
 {
6a9155
-	pr_debug("PM: Adding info for %s:%s\n",
6a9155
-		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
6a9155
 	mutex_lock(&dpm_list_mtx);
6a9155
 	if (dev->parent && dev->parent->power.is_prepared)
6a9155
 		dev_warn(dev, "parent %s should not be sleeping\n",
Jesse Keating 7a3296
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
cc7213
index cb5ece77fd7d..4022b75eaad7 100644
Jesse Keating 7a3296
--- a/drivers/input/serio/i8042.c
Jesse Keating 7a3296
+++ b/drivers/input/serio/i8042.c
08cb3a
@@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)
Jesse Keating 7a3296
 static int i8042_controller_check(void)
Jesse Keating 7a3296
 {
69fef5
 	if (i8042_flush()) {
Kyle McMartin 4f8602
-		pr_err("No controller found\n");
Jesse Keating 7a3296
 		return -ENODEV;
69fef5
 	}
69fef5
 
6a9155
diff --git a/net/can/af_can.c b/net/can/af_can.c
35eff4
index 7933e62a7318..96a911003af7 100644
Kyle McMartin 123d53
--- a/net/can/af_can.c
Kyle McMartin 123d53
+++ b/net/can/af_can.c
208228
@@ -155,13 +155,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
Jesse Keating 7a3296
 		err = request_module("can-proto-%d", protocol);
Jesse Keating 7a3296
 
Jesse Keating 7a3296
 		/*
Jesse Keating 7a3296
-		 * In case of error we only print a message but don't
Jesse Keating 7a3296
-		 * return the error code immediately.  Below we will
Jesse Keating 7a3296
-		 * return -EPROTONOSUPPORT
Kyle McMartin 123d53
+		 * In case of error we but don't return the error code immediately.
Jesse Keating 7a3296
+		 * Below we will return -EPROTONOSUPPORT
Jesse Keating 7a3296
 		 */
Kyle McMartin 4a2041
-		if (err)
Kyle McMartin 4a2041
-			printk_ratelimited(KERN_ERR "can: request_module "
Jesse Keating 7a3296
-			       "(can-proto-%d) failed.\n", protocol);
Kyle McMartin 123d53
 
Kyle McMartin 123d53
 		cp = can_get_proto(protocol);
Jesse Keating 7a3296
 	}