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