Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752332AbdHDOrH (ORCPT ); Fri, 4 Aug 2017 10:47:07 -0400 Received: from mout.web.de ([212.227.15.14]:51182 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751384AbdHDOrG (ORCPT ); Fri, 4 Aug 2017 10:47:06 -0400 To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras , Russell Currey Cc: LKML , kernel-janitors@vger.kernel.org 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-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit 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= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1558 Lines: 50 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 */ -- 2.13.4