bface6d
From 372b0f17e7f64fbd3a22ea48f36ea4cdfe607b2b Mon Sep 17 00:00:00 2001
Jesse Keating 7a32965
From: Peter Jones <pjones@redhat.com>
Jesse Keating 7a32965
Date: Thu, 25 Sep 2008 16:23:33 -0400
6a91557
Subject: [PATCH] input: silence i8042 noise
Jesse Keating 7a32965
6a91557
Don't print an error message just because there's no i8042 chip.
Jesse Keating 7a32965
Some systems, such as EFI-based Apple systems, won't necessarily have an
Jesse Keating 7a32965
i8042 to initialize.  We shouldn't be printing an error message in this
Jesse Keating 7a32965
case, since not detecting the chip is the correct behavior.
6a91557
6a91557
Bugzilla: N/A
6a91557
Upstream-status: Fedora mustard
Jesse Keating 7a32965
---
6a91557
 drivers/base/power/main.c   | 2 --
6a91557
 drivers/input/serio/i8042.c | 1 -
6a91557
 net/can/af_can.c            | 8 ++------
6a91557
 3 files changed, 2 insertions(+), 9 deletions(-)
6a91557
6a91557
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
6a91557
index b67d9aef9fe4..dd58b0fdaafd 100644
6a91557
--- a/drivers/base/power/main.c
6a91557
+++ b/drivers/base/power/main.c
6a91557
@@ -122,8 +122,6 @@ void device_pm_unlock(void)
6a91557
  */
6a91557
 void device_pm_add(struct device *dev)
6a91557
 {
6a91557
-	pr_debug("PM: Adding info for %s:%s\n",
6a91557
-		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
6a91557
 	mutex_lock(&dpm_list_mtx);
6a91557
 	if (dev->parent && dev->parent->power.is_prepared)
6a91557
 		dev_warn(dev, "parent %s should not be sleeping\n",
Jesse Keating 7a32965
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
cf23086
index f5a98af3b325..9bb95eab6926 100644
Jesse Keating 7a32965
--- a/drivers/input/serio/i8042.c
Jesse Keating 7a32965
+++ b/drivers/input/serio/i8042.c
6a91557
@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)
Jesse Keating 7a32965
 static int i8042_controller_check(void)
Jesse Keating 7a32965
 {
69fef57
 	if (i8042_flush()) {
Kyle McMartin 4f86024
-		pr_err("No controller found\n");
Jesse Keating 7a32965
 		return -ENODEV;
69fef57
 	}
69fef57
 
6a91557
diff --git a/net/can/af_can.c b/net/can/af_can.c
6a91557
index ce82337521f6..a3fee4becc93 100644
Kyle McMartin 123d535
--- a/net/can/af_can.c
Kyle McMartin 123d535
+++ b/net/can/af_can.c
6a91557
@@ -158,13 +158,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
Jesse Keating 7a32965
 		err = request_module("can-proto-%d", protocol);
Jesse Keating 7a32965
 
Jesse Keating 7a32965
 		/*
Jesse Keating 7a32965
-		 * In case of error we only print a message but don't
Jesse Keating 7a32965
-		 * return the error code immediately.  Below we will
Jesse Keating 7a32965
-		 * return -EPROTONOSUPPORT
Kyle McMartin 123d535
+		 * In case of error we but don't return the error code immediately.
Jesse Keating 7a32965
+		 * Below we will return -EPROTONOSUPPORT
Jesse Keating 7a32965
 		 */
Kyle McMartin 4a20417
-		if (err)
Kyle McMartin 4a20417
-			printk_ratelimited(KERN_ERR "can: request_module "
Jesse Keating 7a32965
-			       "(can-proto-%d) failed.\n", protocol);
Kyle McMartin 123d535
 
Kyle McMartin 123d535
 		cp = can_get_proto(protocol);
Jesse Keating 7a32965
 	}
6a91557
-- 
6a91557
1.9.3
Kyle McMartin 6c1e38b