kernel/input-silence-i8042-noise.patch

67 lines
2.2 KiB
Diff
Raw Normal View History

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