From patchwork Fri Aug 4 14:46:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 797835 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xP8tY3xp7z9sRm for ; Sat, 5 Aug 2017 00:48:21 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xP8tY2sPPzDqk9 for ; Sat, 5 Aug 2017 00:48:21 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.15.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xP8sK2MJgzDqJ7 for ; Sat, 5 Aug 2017 00:47:16 +1000 (AEST) Received: from [192.168.1.2] ([78.49.135.73]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MS1xS-1e6t2223h4-00TAvH; Fri, 04 Aug 2017 16:46:56 +0200 To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras , Russell Currey From: SF Markus Elfring Subject: [PATCH] powerpc/eeh: Delete an error message for a failed memory allocation in two functions Message-ID: <0a35cb55-9f6b-21ca-565f-cab26237c962@users.sourceforge.net> Date: Fri, 4 Aug 2017 16:46:51 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:jw7faWDnovbKF/D3veu5p+7oY66+WH2B4XY4osTeMX89mEmn0hO 6Ivn8hghWhsVRWoVgLafjfmvk/tNbI/YNVlxeaDZDrzPerxw/X5eRUWGYqJllzooMKTVM+7 HfFzX3fn8TD8nzJVXGEXkCvjKAzRklbnEDvKVdeqTyq3ui7EM23VtoyIGoiFrxb0cdpTH+E pqQZUq8sy0yxaJ0MrrMQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:IVJDKHsvB8c=:7/Yj9ANpdyT8aPnF5tkjUN X9AmlLYa5dzyxvmnHFoIoewQkuHUiC9x4putmvTLyi0WvAUO9/uUyel1UoJhga9PiuGsGbGQr CiEIKAyVPDfiIanV3E29mvZdn9tK0Geg2XZ8cHP09rfIP2iYYsh0TBDjpdlcMfaoBtrnWOVZ0 V4gAzQAaYbqV1Jrek+RDK6WTM1N6rc7xYlhN0F8vhBTPRXgp6Z/lW/5xyCaa00MBw/cHZ79/r ZwuK2IBOE8z79jV1X15o4/l93jnvFuEM0nnGJLBrSu7VV7Vzj5zepLa/VEeQ4yq/fGtIe2Bie mdPa3/nyektRDolSiK1eAv8U7zUfxrjGzqrhmNYo/F/JxYGuQL5E5LYhHpLBP1ucv7GjqhXRJ BwSW7y41paU30GdGUSRwxvnDg4lATjzhJMbytklD5FvWO7uJWqy4sWISavrL96J8lPcGnbCWi pDU0kzsW8jMeYmy8E6erZhfz1LcGGPeLy63z5NNEQeJiuXqOYyq20KAZmPETN/bTQsVjS6nOe vPMY0B2DoN03LMR8VmeiVvJOsGheHU6dc/bAYtSSKmVZYZ25bFZIJxyKP8G6Po299zOKUY09G ietScW1bdp9km3OeIP0Edk3zQ4sQR7g4Tn1hbsZjXw2C7YCAn/BG6TtQNyabLp0tIHvWHOITI 7pDLVO1ZF/pN+RBcDj1Jeh6lccyvFQrG0iEAR6qcjBtLrzRpAuW5eM6V41qWYf0+LpaNp2x0E kHy86BS31C9qZlW/ipfS7D5O4N6zMnQ3NIiaW8LMpnRj1Fl0NGm2kIoSIyHxDRtE/R8D8RF2k rMftYyKLQ2X9aIKGRzizet5DBdGG2+YNyS6RP4EVt/1N3Ujq28= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Fri, 4 Aug 2017 16:37:56 +0200 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- arch/powerpc/kernel/eeh_dev.c | 5 +---- arch/powerpc/kernel/eeh_event.c | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/eeh_dev.c b/arch/powerpc/kernel/eeh_dev.c index d6b2ca70d14d..2742ecbadf18 100644 --- a/arch/powerpc/kernel/eeh_dev.c +++ b/arch/powerpc/kernel/eeh_dev.c @@ -55,11 +55,8 @@ struct eeh_dev *eeh_dev_init(struct pci_dn *pdn) /* Allocate EEH device */ edev = kzalloc(sizeof(*edev), GFP_KERNEL); - if (!edev) { - pr_warn("%s: out of memory\n", - __func__); + if (!edev) return NULL; - } /* Associate EEH device with OF node */ pdn->edev = edev; diff --git a/arch/powerpc/kernel/eeh_event.c b/arch/powerpc/kernel/eeh_event.c index accbf8b5fd46..c62bd90e038f 100644 --- a/arch/powerpc/kernel/eeh_event.c +++ b/arch/powerpc/kernel/eeh_event.c @@ -132,10 +132,9 @@ int eeh_send_failure_event(struct eeh_pe *pe) struct eeh_event *event; event = kzalloc(sizeof(*event), GFP_ATOMIC); - if (!event) { - pr_err("EEH: out of memory, event not handled\n"); + if (!event) return -ENOMEM; - } + event->pe = pe; /* We may or may not be called in an interrupt context */