summaryrefslogtreecommitdiffstats
path: root/input-silence-i8042-noise.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-14 08:40:03 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-14 08:41:32 -0400
commit0b12c85af6596ee57731bb7ef0e73ab4b307d661 (patch)
tree4cedc32224c3bbef2a878a44bbcd46266a7205a4 /input-silence-i8042-noise.patch
parent60c24aba493c878816eb0c0aa1b70ff6c12bb26e (diff)
downloadkernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.tar.gz
kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.tar.xz
kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.zip
Linux v4.3-rc1
- Disable debugging options. Also rebase the kdbus patches against 4.3-rc1
Diffstat (limited to 'input-silence-i8042-noise.patch')
-rw-r--r--input-silence-i8042-noise.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch
deleted file mode 100644
index d1103c244..000000000
--- a/input-silence-i8042-noise.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 25 Sep 2008 16:23:33 -0400
-Subject: [PATCH] input: silence i8042 noise
-
-Don't print an error message just because there's no i8042 chip.
-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
----
- 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 30b7bbfdc558..95863902627f 100644
---- a/drivers/base/power/main.c
-+++ b/drivers/base/power/main.c
-@@ -123,8 +123,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",
-diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index cb5ece77fd7d..4022b75eaad7 100644
---- a/drivers/input/serio/i8042.c
-+++ b/drivers/input/serio/i8042.c
-@@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)
- static int i8042_controller_check(void)
- {
- if (i8042_flush()) {
-- pr_err("No controller found\n");
- return -ENODEV;
- }
-
-diff --git a/net/can/af_can.c b/net/can/af_can.c
-index 7933e62a7318..96a911003af7 100644
---- a/net/can/af_can.c
-+++ b/net/can/af_can.c
-@@ -155,13 +155,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
- 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
-+ * In case of error we but don't return the error code immediately.
-+ * Below we will return -EPROTONOSUPPORT
- */
-- if (err)
-- printk_ratelimited(KERN_ERR "can: request_module "
-- "(can-proto-%d) failed.\n", protocol);
-
- cp = can_get_proto(protocol);
- }