From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754066AbdHUUyK (ORCPT ); Mon, 21 Aug 2017 16:54:10 -0400 Received: from mout.web.de ([212.227.15.3]:52842 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753941AbdHUUyI (ORCPT ); Mon, 21 Aug 2017 16:54:08 -0400 Subject: [PATCH 1/4] w1: Delete an error message for a failed memory allocation in two functions From: SF Markus Elfring To: "Andrew F. Davis" , Christophe Jaillet , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Evgeniy Polyakov , "Maciej S. Szmigiero" , Sebastian Reichel , Wei Yongjun Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <2caa1294-178b-b7da-8f1c-e3200a88a62f@users.sourceforge.net> Date: Mon, 21 Aug 2017 22:53:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:mGBs9a2UMqyzFUL8xb9avDBZsXckdOnGMUInb1bp5y40CpBN0LD iuNmc0yM627qO5/yf3bWSR2QpkPh7rGR51NcrNdKXgQluftgzL+bEIuT8tB85AWFZNlaonb aX7fv+9ha7ks5QYIP/IvaKnMO5Rpx7PCYuBj2E6ae0q8Wrp1H2ajrfoNCfJC8/6GrzWXPEc 7xjaUdoKSYj8lDk0viF5A== X-UI-Out-Filterresults: notjunk:1;V01:K0:EvfTFirNOYI=:miDWD7X1/eoXlZ1JEKbANX EShwprPyDxlgZGw0Ekd0SIGTnplD9w985oSQK2l7GZq5b/VVRJ2CGURJUF8smZp4DQ49lWpub RIAORy9ZRZ2oTh97ePQe5DzoPfMxyEPlGIExwFP4C2H5SSFv23o6VgLzqAMLIIpYfZ1/o0l6O DUx1oWekoXNK+L3ZmxzN1zt6RuzoIMt92RLh2FSur0csWmfKYCSz7Wx7+yRCZpYUHWPLQ0GGt vIaXRZHyiG4sxRcZ3i81q1RK1fDlRKS4Ps4d2+fthdm/QLrNEN639eZBKihh7xs+X1xm7IaL9 1xV5W4yR+Gqq8/RLsCMbo67S+aVBstB8USTfGTyo6zx+9TXC8colSOu/mfkflvZWHQEd0OsSD ySJWFAYE1VneGnV1Q3uQq+ROEy/n+lgblDhZnWlUGvAZNRbXeUpYcBJm+tgONec2Hfsyr/z7o JVIenU8wpLS8yH0Ad2WlWEbuN1o6apfqBBIM8SSe3z9sOOmRZs1A4/8FulY93vc7WuARetsYu kG+9f/ZWWWwNN5GUWFL/wezPHsFXPbJ1zl64ws9Kjv0TmzEi1uMoRj4ld+B58pQtXXbPDdrFw B07oVtwhzC8WlqyZCEBSck9ACsSLtKCZ3aZmVbSMa2VwXibrG3SBgH5sceR1ZpqAQbuZdS9/m 1rbiPe7nZoCHxgBWyrQZOpsUKrrzItnHNB5vWxKKA5rqh6cD7dmnaaiibVfTuiqizBiZ4eG5C 0UkKfqsq4X3//lkCnfIp/IY2Ed3EEjYbehwf4mVGwsjGRQd2DnQm45AIUlZGcHnAsziJrA7jq nNCwSzWNiz99eehpWj9x0HCXYwCmsYurz+QttUWJs32jr2LSnDtamKRCWxH6Jbqlx5E9O9m Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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