PM / OPP / clk: Remove unnecessary OOM message

This patch reduces the kernel size by removing error messages that duplicate
the normal OOM message.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr)

@@
identifier f,print,l;
expression e;
constant char[] c;
@@

e = \(kzalloc\|kmalloc\|devm_kzalloc\|devm_kmalloc\)(...);
if (e == NULL) {
  <+...
-  print(...,c,...);
  ... when any
(
  goto l;
|
  return ...;
)
  ...+> }

Signed-off-by: Quentin Lambert <[email protected]>
Acked-by: Nishanth Menon <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 58470c3953015b7180de159082b154e5eef70256..c3293f0a8573853f7f0079117b10d3cd1529093d 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -855,7 +855,6 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
 
        fw_priv = kzalloc(sizeof(*fw_priv), GFP_KERNEL);
        if (!fw_priv) {
-               dev_err(device, "%s: kmalloc failed\n", __func__);
                fw_priv = ERR_PTR(-ENOMEM);
                goto exit;
        }

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index d626576a4f755b522febe3662a3e554eb38582e8..7fdd0172605afe1be1f74fa90593932a97153787 100644 (file)
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -81,10 +81,8 @@ static int __pm_clk_add(struct device *dev, const char *con_id,
                return -EINVAL;
 
        ce = kzalloc(sizeof(*ce), GFP_KERNEL);
-       if (!ce) {
-               dev_err(dev, "Not enough memory for clock entry.\n");
+       if (!ce)
                return -ENOMEM;
-       }
 
        if (con_id) {
                ce->con_id = kstrdup(con_id, GFP_KERNEL);

diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 15bf29974c312a83fbf18c3a78b4b00f5d858cd5..677fb28435532b4274eda86696d986a12da800a1 100644 (file)
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -474,10 +474,8 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq,
 
        /* allocate new OPP node */
        new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL);
-       if (!new_opp) {
-               dev_warn(dev, "%s: Unable to create new OPP node\n", __func__);
+       if (!new_opp)
                return -ENOMEM;
-       }
 
        /* Hold our list modification lock here */
        mutex_lock(&dev_opp_list_lock);
@@ -695,10 +693,8 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,
 
        /* keep the node allocated */
        new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);
-       if (!new_opp) {
-               dev_warn(dev, "%s: Unable to create OPP\n", __func__);
+       if (!new_opp)
                return -ENOMEM;
-       }
 
        mutex_lock(&dev_opp_list_lock);