From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753841AbdASRBd (ORCPT ); Thu, 19 Jan 2017 12:01:33 -0500 Received: from mout.web.de ([212.227.15.3]:50636 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753363AbdASRBF (ORCPT ); Thu, 19 Jan 2017 12:01:05 -0500 Subject: [PATCH 6/8] powerpc/nvram: Delete three error messages for a failed memory allocation To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Daniel Axtens , Geliang Tang , Michael Ellerman , Nathan Fontenot , Pan Xinhui , Paul Gortmaker , Paul Mackerras References: <53545d97-6ed5-ff17-384f-82e72b3592f9@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang From: SF Markus Elfring Message-ID: <00845261-8528-d011-d3b8-e9355a231d3a@users.sourceforge.net> Date: Thu, 19 Jan 2017 18:00:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <53545d97-6ed5-ff17-384f-82e72b3592f9@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ASa1txEL4u1GmoE37MXhka4qMRvnMvEdkVOU8kxe+kddK/0r+vO bzg1XSIN+b/oTZDDNh3oqBLi5wvzVP5XrjySAvsjqadvEpkUV+OZS6Rbj+92wnsqGiI88UJ D/SYUAIew5waBH6OJML5MDGvc2a4WwD4LXLCT5eqDGkMXJ+vi5IubHeuK8yR0tag/rAqROY aPWbS2LctuHE+9FcfkM0w== X-UI-Out-Filterresults: notjunk:1;V01:K0:j/Nc3nkXweY=:XR7zNsjJUgqBfoxJuhx6WX hNruqyQJuly9wGmV4NDSWWDpeKMAIanTTD0QxyNUJzXYUW4VmZsufx8lrV6zeoZ4j7rki5vs4 fpwRvdOMsKc5XPFiWFHWEblzj337oT6zyj3D45PFMSwCxI6ACjgdBFk4jyMr9VyoseYp9v5qA 4aNizxf15kuQx6a+QgyeUyP71z3aOqVjJRCUlNK1/8/TaBgf5u3mqCUYPhFm2ls56r1Hfaq3S neVqjLi3d8rJKhQsc5PLrXmEOO8t1N/RTMbESgsZSzSONgw/g2AgDDcOiYSCZLIAzXn0W6fkE exmEnTpKexxPFPuy95zltDMI1EuGRNLyRxGYHsdD8njxVPFp0xmOZMMUmWJTtSBxfjVQRsYN4 78Bp2YGm/rOPuF4Gje0X53HnICcafnqRu9FLI9ljIOMjiuqu2ZqZg+182IehImOkbMMQjlvRl J2ZVS6IMm4wh761Iw+K8VeS43v4/OsAHJM2LSswz2RhwjaDKQOTsnbQCmngkYsrF+66pLPvbO Zei1CmFHETiR96XTNWxnkhlyLwnQT92X/J92Sa6FwiC7sYwcScQ4d8/6P2BvxSpGpLGkd6m0/ QnBW4qumgz4jX2gQ4AxBpr1vSUL+pKhSOk3/No02Wq69DGj3+tZGzJTZvmkp9HkC3CYUqorHO EPJlRwmV6KJVnvyNKRNx/c2Gvh5vY9nvcK+Fun0p8/QDqlkfQ6QaAPHPOL1ExSVzhaI01CCcS 49+ihp6b9KNarRyAXTY/G6abICWvtyCo9JW+HJNoCSIKysKkv/pL7ypnPAsK3++YEJhKtdqgU 5CbtUDu Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 19 Jan 2017 16:56:46 +0100 The script "checkpatch.pl" pointed information out like the following. WARNING: Possible unnecessary 'out of memory' message Thus fix affected source code places. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/nvram_64.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index 68b970bcf2fc..7af1baaaf01b 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -1040,10 +1040,8 @@ loff_t __init nvram_create_partition(const char *name, int sig, /* Create our OS partition */ new_part = kmalloc(sizeof(*new_part), GFP_KERNEL); - if (!new_part) { - pr_err("%s: kmalloc failed\n", __func__); + if (!new_part) return -ENOMEM; - } new_part->index = free_part->index; new_part->header.signature = sig; @@ -1145,10 +1143,8 @@ int __init nvram_scan_partitions(void) total_size = ppc_md.nvram_size(); header = kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL); - if (!header) { - printk(KERN_ERR "nvram_scan_partitions: Failed kmalloc\n"); + if (!header) return -ENOMEM; - } while (cur_index < total_size) { @@ -1181,10 +1177,8 @@ int __init nvram_scan_partitions(void) } tmp_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL); err = -ENOMEM; - if (!tmp_part) { - printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n"); + if (!tmp_part) goto out; - } memcpy(&tmp_part->header, &phead, NVRAM_HEADER_LEN); tmp_part->index = cur_index; -- 2.11.0