From patchwork Tue Oct 17 12:11:49 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: 826926 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 3yGYzj4Qryz9sPr for ; Tue, 17 Oct 2017 23:15:13 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yGYzj3HMQzDrJm for ; Tue, 17 Oct 2017 23:15:13 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.15.3; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.15.3]) (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 3yGYwD39NlzDrGy for ; Tue, 17 Oct 2017 23:12:11 +1100 (AEDT) Received: from [192.168.1.2] ([92.228.183.125]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MH2Fm-1e0Wij2p62-00Dohg; Tue, 17 Oct 2017 14:11:51 +0200 Subject: [PATCH 1/3] powerpc-opal: Delete ten error messages for a failed memory allocation From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, Anju T Sudhakar , Benjamin Herrenschmidt , Bhumika Goyal , Corentin Labbe , Hemant Kumar , Madhavan Srinivasan , Mahesh Salgaonkar , Michael Ellerman , Michael Neuling , Neelesh Gupta , Nicholas Piggin , Paul Mackerras , Rob Herring , Shilpasri G Bhat , Stewart Smith , Tyrel Datwyler , Vasant Hegde References: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Message-ID: Date: Tue, 17 Oct 2017 14:11:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:7o7u/SzQY+0qDKKcf/kp7F4IfGTKhTrX0a5OshiNIWVkWkicN8X s2Y0Z6upTtg8/GJDxQXTBRLjuJvdsDnnuZXbIen6AZJHWbURAPx/7GnSjzQ6XTuBY/xOC9v uwt5fkeTDSjGyZQbsk5eYO+KE/Ghm9NSyeC+oUL4Km0oUiNhcx8wO6cY28b2vVwJUh1ZXd1 apWjnZQCHTNoHh2+YdqQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:RGpTEVd183E=:wI3ipxoEViso7+GUUoQ2Es 1VeH0K5Jvyqp37yx1CNAotxIYUpmplNVxSaiCm2i7vefZzOwbW01gzXv0tDMGkzsWMLBTsUwt 8chUHUYNVuRSH9mOmVYdj/KyH9TTFV4RQC//gU0bkw49CXMnLCHM+Ioicq7XrqcjKJwZesBEA yDHFE8OXtNfY9GT2SNtcvPx96hr4ZL9EG/TG22IRj83WetksDLumXXP3uGXElZYJIDrX7cpCw gXwhZujB3GDCXl0iHuSM5IcmfESYPlp0zzEi63vOPAfhPmpwpGZE+N4k5En142/6q9jRX1c8Z QV2ArwjR6Ozs3tMu37kM/OwZ/N6SNZ4lO8GMrBfTFNnF7y2ySngYQA0YGGjGoO5JD/jIkRK+N ttR70CH/EQDuM0opYAthdN8GAKkupzz20EaqEgvQx8Jwb/FqjuBQ0kCI/JLaMY79rqImOQR+I i2DlA+OdzuyCSZAz8JW9ttdHvpq2T/5gzdXoAabpFDYpMXK5W8RF/OursTukYQYvtEHqgze/l mzjK5kFw52h12y+dTl6cTfDUx7ZsXXnKzbx9XZ33Q8t4gFy1d/+ZUYBUvXrdc47QARLBdcEeT oANaFQOHGt0t+NQs2EKnHcvENIBDjV/1kKujSPewEu9UySPYv4bK8z8TAgKZ7fAEFRd89Qudd Le0m8EV//V9omlvNCsg3GNwLcb/W/0nATvJMO6ZDSENE82qddqPowC0v9qgmS54rNlaCJrpIB EI7WnKBbdaPrmeXgjoP4Fd2jK29pV0FBsOPe6LWzYi3z9nCSmYhsJRGYbRIa2ZHjUaNeoa5dC 1l4IGQmlB8IcAA5WF/P3lT28KFp6sLKCc3gV2GtHmMDV6yaE8M= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 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: Tue, 17 Oct 2017 12:21:40 +0200 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/powerpc/platforms/powernv/opal-async.c | 2 -- arch/powerpc/platforms/powernv/opal-dump.c | 1 - arch/powerpc/platforms/powernv/opal-flash.c | 4 +--- arch/powerpc/platforms/powernv/opal-hmi.c | 5 ++--- .../powerpc/platforms/powernv/opal-memory-errors.c | 6 ++---- arch/powerpc/platforms/powernv/opal-sysparam.c | 25 +++++----------------- 6 files changed, 10 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c index cf33769a7b72..2b11d8444b5a 100644 --- a/arch/powerpc/platforms/powernv/opal-async.c +++ b/arch/powerpc/platforms/powernv/opal-async.c @@ -193,8 +193,6 @@ int __init opal_async_comp_init(void) sizeof(*opal_async_responses) * opal_max_async_tokens, GFP_KERNEL); if (!opal_async_responses) { - pr_err("%s: Out of memory, failed to do asynchronous " - "completion init\n", __func__); err = -ENOMEM; goto out_opal_node; } diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c index 4c827826c05e..b54864feef84 100644 --- a/arch/powerpc/platforms/powernv/opal-dump.c +++ b/arch/powerpc/platforms/powernv/opal-dump.c @@ -244,7 +244,6 @@ static int64_t dump_read_data(struct dump_obj *dump) /* Allocate memory */ dump->buffer = vzalloc(PAGE_ALIGN(dump->size)); if (!dump->buffer) { - pr_err("%s : Failed to allocate memory\n", __func__); rc = -ENOMEM; goto out; } diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/platforms/powernv/opal-flash.c index 2fa3ac80cb4e..77d564266a59 100644 --- a/arch/powerpc/platforms/powernv/opal-flash.c +++ b/arch/powerpc/platforms/powernv/opal-flash.c @@ -437,10 +437,8 @@ static int alloc_image_buf(char *buffer, size_t count) } image_data.data = vzalloc(PAGE_ALIGN(image_data.size)); - if (!image_data.data) { - pr_err("%s : Failed to allocate memory\n", __func__); + if (!image_data.data) return -ENOMEM; - } /* Pin memory */ addr = image_data.data; diff --git a/arch/powerpc/platforms/powernv/opal-hmi.c b/arch/powerpc/platforms/powernv/opal-hmi.c index d78fed728cdf..b7dfe41a0a96 100644 --- a/arch/powerpc/platforms/powernv/opal-hmi.c +++ b/arch/powerpc/platforms/powernv/opal-hmi.c @@ -310,10 +310,9 @@ static int opal_handle_hmi_event(struct notifier_block *nb, /* Delay the logging of HMI events to workqueue. */ msg_node = kzalloc(sizeof(*msg_node), GFP_ATOMIC); - if (!msg_node) { - pr_err("HMI: out of memory, Opal message event not handled\n"); + if (!msg_node) return -ENOMEM; - } + memcpy(&msg_node->hmi_evt, hmi_evt, sizeof(struct OpalHMIEvent)); spin_lock_irqsave(&opal_hmi_evt_lock, flags); diff --git a/arch/powerpc/platforms/powernv/opal-memory-errors.c b/arch/powerpc/platforms/powernv/opal-memory-errors.c index 4495f428b500..8d76c05252d1 100644 --- a/arch/powerpc/platforms/powernv/opal-memory-errors.c +++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c @@ -107,11 +107,9 @@ static int opal_memory_err_event(struct notifier_block *nb, return 0; msg_node = kzalloc(sizeof(*msg_node), GFP_ATOMIC); - if (!msg_node) { - pr_err("MEMORY_ERROR: out of memory, Opal message event not" - "handled\n"); + if (!msg_node) return -ENOMEM; - } + memcpy(&msg_node->msg, msg, sizeof(struct opal_msg)); spin_lock_irqsave(&opal_mem_err_lock, flags); diff --git a/arch/powerpc/platforms/powernv/opal-sysparam.c b/arch/powerpc/platforms/powernv/opal-sysparam.c index 23fb6647dced..1df05efe55a1 100644 --- a/arch/powerpc/platforms/powernv/opal-sysparam.c +++ b/arch/powerpc/platforms/powernv/opal-sysparam.c @@ -184,11 +184,8 @@ void __init opal_sys_param_init(void) /* Allocate big enough buffer for any get/set transactions */ param_data_buf = kzalloc(MAX_PARAM_DATA_LEN, GFP_KERNEL); - if (!param_data_buf) { - pr_err("SYSPARAM: Failed to allocate memory for param data " - "buf\n"); + if (!param_data_buf) goto out_kobj_put; - } /* Number of parameters exposed through DT */ count = of_property_count_strings(sysparam, "param-name"); @@ -199,25 +196,16 @@ void __init opal_sys_param_init(void) } id = kzalloc(sizeof(*id) * count, GFP_KERNEL); - if (!id) { - pr_err("SYSPARAM: Failed to allocate memory to read parameter " - "id\n"); + if (!id) goto out_param_buf; - } size = kzalloc(sizeof(*size) * count, GFP_KERNEL); - if (!size) { - pr_err("SYSPARAM: Failed to allocate memory to read parameter " - "size\n"); + if (!size) goto out_free_id; - } perm = kzalloc(sizeof(*perm) * count, GFP_KERNEL); - if (!perm) { - pr_err("SYSPARAM: Failed to allocate memory to read supported " - "action on the parameter"); + if (!perm) goto out_free_size; - } if (of_property_read_u32_array(sysparam, "param-id", id, count)) { pr_err("SYSPARAM: Missing property param-id in the DT\n"); @@ -236,11 +224,8 @@ void __init opal_sys_param_init(void) } attr = kzalloc(sizeof(*attr) * count, GFP_KERNEL); - if (!attr) { - pr_err("SYSPARAM: Failed to allocate memory for parameter " - "attributes\n"); + if (!attr) goto out_free_perm; - } /* For each of the parameters, populate the parameter attributes */ for (i = 0; i < count; i++) {