[PATCH v2 06/12] w1: do not log errors about failed memory allocations

[Steffen Vogel]

This fixes a warning raised by the checkpatch tool.

Signed-off-by: Steffen Vogel <p...@steffenvogel.de>
---
 drivers/w1/w1.c     | 7 +------
 drivers/w1/w1_int.c | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index a8ead2350521..cbfc3f7012de 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -757,13 +757,8 @@ int w1_attach_slave_device(struct w1_master *dev, struct 
w1_reg_num *rn)
        struct w1_netlink_msg msg;
 
        sl = kzalloc(sizeof(struct w1_slave), GFP_KERNEL);
-       if (!sl) {
-               dev_err(&dev->dev,
-                        "%s: failed to allocate new slave device.\n",
-                        __func__);
+       if (!sl)
                return -ENOMEM;
-       }
-
 
        sl->owner = THIS_MODULE;
        sl->master = dev;
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index efe03b9e23f5..a6c011e57c90 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -33,12 +33,8 @@ static struct w1_master *w1_alloc_dev(u32 id, int 
slave_count, int slave_ttl,
         */
        dev = kzalloc(sizeof(struct w1_master) +
                sizeof(struct w1_bus_master), GFP_KERNEL);
-       if (!dev) {
-               pr_err("Failed to allocate %zd bytes for new w1 device.\n",
-                       sizeof(struct w1_master));
+       if (!dev)
                return NULL;
-       }
-
 
        dev->bus_master = (struct w1_bus_master *)(dev + 1);
 
-- 
2.11.0