From patchwork Thu Jan 4 20:24:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 855810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BJuThQWD"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zCK623CGxz9s7c for ; Fri, 5 Jan 2018 07:24:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Date:Message-ID:Subject: From:To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=eQkXURFt8V7W9io8k5tT2Ls+1mZQjQzn3EefDiuxHxc=; b=BJuThQWDVA4l03 9u+7KuLm61Jx0O+nS9Tm5Wssk1PDUkAFSJen+xRdFYskO0uTIL6qpZ4IGGqBh6VffBWa5Zz8Kfm5V 7re6qNweewlGY58+p4mTtBPR4X54VkYchgbOPzTwHM2p7Xf+xkW88GlZ/bac+aJC33mbFYyAEQ6eY hwcOooSTibKv3P9nVJmpxqmxsH0lJu55f/v2vOU7ppeQkVjjtObsAsSMSqsLRrDs0oGuCj2s5LFHa wGYsdLJyHeQFz90J1j5vsmXjir3Iz6OnCkEKq/wOAoAyEuyDCvPKpVGt2zqLt3kxBAIHsQPK/akIj YQ+3h1aCVNUi9Xyl0z3g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eXC40-00051J-KM; Thu, 04 Jan 2018 20:24:32 +0000 Received: from mout.web.de ([217.72.192.78]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eXC3x-0004z9-9v for linux-mtd@lists.infradead.org; Thu, 04 Jan 2018 20:24:31 +0000 Received: from [192.168.1.3] ([78.48.111.36]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LzbLS-1f1QWC35rW-014jL6; Thu, 04 Jan 2018 21:24:14 +0100 To: linux-mtd@lists.infradead.org, Boris Brezillon , Brian Norris , Cyrille Pitchen , David Woodhouse , Marek Vasut , Richard Weinberger From: SF Markus Elfring Subject: [PATCH] mtdoops: Delete an error message for a failed memory allocation in two functions Message-ID: Date: Thu, 4 Jan 2018 21:24:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:MJNw5d6omsXJ0rRbugCdN+Bt263eKiGvF6XHPIBlWhBMl1uTC6/ SCXHoi5TsMRTWjUoHh6LZIFFjjbzJ9FybzIzTheAAoJkLFFOzImJx3G+0O6Fp6UxUY9vGay fw2gSUI7NHBpsq8Of7w0tMeORmlHveFDrdxvJHopuu9vxcNn+KZ5MBlr7z3oR7D52dpbRbR 6sKHfVE5o70wk8T8a1l0Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:DAs5s+ONplg=:DhOCFA4TSxbUceIyZlNtU+ FnYdQyyJQYkIWoPbuQgKA3tXV8DbVn42QomlxvGselUqfcwJFZ8iMdw6YhJlE/hg+asHGpe0W zgouR506aS7hYdzUNEc4dg7COIErUBiyrmiCCrXybjhv4Zk9oOf2kXBNORq6lnQ3zd7ipGGgl dIldqvhr2bwN7pntgav7BhcaOiFbZo9t1dE2y7zp6DEBk5fA9fBNajFOCcObyG6uoY7xC8Uey /aEie2o9GP5FgIQ015EkGBTE2SKce3FoYej0xMD/cSE2VErMl5PHHIfQFqoKFJbIcZWL5VDrz wFhf6gV2cB0+yar7RrNDJYVeBCk+rLGLM8lXpm84v0s/bSKsyiZSuk3Vw3Krz/y+DSEo0EhEH ulWAqrG2XDY3JpozG/XpXzbRDVQYx/STgq70FL40gNHszPh2OIEXo296Pmttp4rQ78UhXA3GF n1Jr2//c7nlwnlacEeEHFGBD2UUN9oXxJPdPnlywLaiY4Ipwud3AW5gjAMw55HoNd8LnMMj5r llUCEOkMrHTtsJaJjyu4X7BgF+/el3jdpvl/2uQgmLMbBfgRFiJUpRBU3nClt8DdKEmxy1sDS kUdCPEyi780QLkkhJsRXWsz/MjFFICSrsWweg5mJA2/ECP1avVWLk9pbEiQM+eT3wvkXlCgJx 1DgANjn92feEYsqyq9SQWgc2YDD8Wr+IAuEF+kfuRJLZbReYeY+mkBxnTKW4AdHliHF0ngUo5 VPAGhNNb3sR53VXJmhGYDlHPCvgABNat+XvUwvBotqLn8uU+1DlPswK2fYqCWBWtAD4NluBVj kCXTnWz7ZG4DWgCsl5KNKjehwicjERt2MMXhwq1xS+Tp6Ivkws= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180104_122429_713203_D040F09D X-CRM114-Status: UNSURE ( 9.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [217.72.192.78 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.78 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Markus Elfring Date: Thu, 4 Jan 2018 21:10:56 +0100 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/mtd/mtdoops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c index 97bb8f6304d4..ea8619ec970b 100644 --- a/drivers/mtd/mtdoops.c +++ b/drivers/mtd/mtdoops.c @@ -352,10 +352,8 @@ static void mtdoops_notify_add(struct mtd_info *mtd) /* oops_page_used is a bit field */ cxt->oops_page_used = vmalloc(DIV_ROUND_UP(mtdoops_pages, BITS_PER_LONG) * sizeof(unsigned long)); - if (!cxt->oops_page_used) { - printk(KERN_ERR "mtdoops: could not allocate page array\n"); + if (!cxt->oops_page_used) return; - } cxt->dump.max_reason = KMSG_DUMP_OOPS; cxt->dump.dump = mtdoops_do_dump; @@ -420,10 +418,9 @@ static int __init mtdoops_init(void) cxt->mtd_index = mtd_index; cxt->oops_buf = vmalloc(record_size); - if (!cxt->oops_buf) { - printk(KERN_ERR "mtdoops: failed to allocate buffer workspace\n"); + if (!cxt->oops_buf) return -ENOMEM; - } + memset(cxt->oops_buf, 0xff, record_size); INIT_WORK(&cxt->work_erase, mtdoops_workfunc_erase);