From: Markus Elfring <[email protected]> Date: Mon, 21 Aug 2017 21:05:42 +0200
Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <[email protected]> --- 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 74471e7aa5cc..f26c1ea280dd 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -715,10 +715,5 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) - 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 1c776178f598..9e37463960ed 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -44,9 +44,5 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, - 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.14.0
