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

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 9717d5f..a3101d2 100644 (file)
--- 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",

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index f5a98af..9bb95ea 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -857,7 +857,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 ce82337..a3fee4b 100644 (file)
--- 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,
                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);
        }