From patchwork Thu Feb 6 06:15:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 317362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5BB0A2C0082 for ; Thu, 6 Feb 2014 17:16:43 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBIG1-0006kU-R2; Thu, 06 Feb 2014 06:16:18 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBIFo-0003gA-SN; Thu, 06 Feb 2014 06:16:04 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBIFm-0003db-3h for linux-mtd@lists.infradead.org; Thu, 06 Feb 2014 06:16:03 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N0K00LHI9E3M630@mailout2.samsung.com> for linux-mtd@lists.infradead.org; Thu, 06 Feb 2014 15:15:39 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 67.45.09028.B8823F25; Thu, 06 Feb 2014 15:15:39 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-ad-52f3288b64c3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C1.72.29263.B8823F25; Thu, 06 Feb 2014 15:15:39 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N0K00FVB9E2RPE0@mmp2.samsung.com>; Thu, 06 Feb 2014 15:15:38 +0900 (KST) From: Jingoo Han To: 'Brian Norris' References: <000201cf2301$b168d250$143a76f0$%han@samsung.com> In-reply-to: <000201cf2301$b168d250$143a76f0$%han@samsung.com> Subject: [PATCH 6/8] mtd: onenand: Remove unnecessary OOM messages Date: Thu, 06 Feb 2014 15:15:38 +0900 Message-id: <000801cf2302$db0ef110$912cd330$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac8jAbE1WngzMHtDT6iqHUbMRstK1wAAQUkw Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsVy+t8zQ91ujc9BBt9OCVgcubCW2WLiysnM FpcXXmK1ONv0ht1id9MydgdWj52z7rJ7bF6h5bF5Sb1H35ZVjAEsUVw2Kak5mWWpRfp2CVwZ N3/+YClYzl+xq/8wcwPjDZ4uRk4OCQETia0ffzBD2GISF+6tZ+ti5OIQEljGKHF7w15WmKJn D74zQiSmM0rM2rWdFcL5xSjxcnsHC0gVm4CaxJcvh9m7GDk4RAQMJH68yQSpYRaYyyixd9FJ RpAaIQFbiX/TtoJN5RSwk/j+7zlYr7CAk8TBM4dYQHpZBFQlWp5kgYR5gcqvfljPDmELSvyY fA+snFlAS2L9zuNMELa8xOY1b5lBWiUE1CUe/dWFuMBI4sRxNYgKEYl9L94xQrxyjV1iR6Mk iM0iICDxbTLEUgkBWYlNB6DBIClxcMUNlglAfyLZOwvJ3llI9s5CsmEBI8sqRtHUguSC4qT0 IiO94sTc4tK8dL3k/NxNjJDI7NvBePOA9SHGZKD1E5mlRJPzgZGdVxJvaGxmZGFqYmpsZG5p RpqwkjjvoodJQUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY5VYeOPPZ41R39xK50As92RaL 7L90rk/W0Guaf6Xn19Vc5+6o1P1x2/4v/SU9/7V+nk1HwHGvb9deK5eVqX4+IpD845/E3ot7 X4e+ZNgWoiP68FvXtyx9zuUFjS83eDhJrZKqVj155nfN0V9qkZ4tl3fU+J9V3+b/84CP+8Kw j5qsN4SVSy+kKbEUZyQaajEXFScCAA2EpgviAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLKsWRmVeSWpSXmKPExsVy+t9jQd1ujc9BBgf381gcubCW2WLiysnM FpcXXmK1ONv0ht1id9MydgdWj52z7rJ7bF6h5bF5Sb1H35ZVjAEsUQ2MNhmpiSmpRQqpecn5 KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAe5UUyhJzSoFCAYnFxUr6dpgm hIa46VrANEbo+oYEwfUYGaCBhHWMGTd//mApWM5fsav/MHMD4w2eLkZODgkBE4lnD74zQthi EhfurWfrYuTiEBKYzigxa9d2VgjnF6PEy+0dLCBVbAJqEl++HGbvYuTgEBEwkPjxJhOkhllg LqPE3kUnwSYJCdhK/Ju2lRXE5hSwk/j+7zlYr7CAk8TBM4dYQHpZBFQlWp5kgYR5gcqvfljP DmELSvyYfA+snFlAS2L9zuNMELa8xOY1b5lBWiUE1CUe/dWFuMBI4sRxNYgKEYl9L94xTmAU moVk0Cwkg2YhGTQLScsCRpZVjKKpBckFxUnpuYZ6xYm5xaV56XrJ+bmbGMGR/0xqB+PKBotD jAIcjEo8vBvWfwoSYk0sK67MPcQowcGsJMJ78TlQiDclsbIqtSg/vqg0J7X4EGMy0JsTmaVE k/OBSSmvJN7Q2MTMyNLIzMLIxNycNGElcd4DrdaBQgLpiSWp2ampBalFMFuYODilGhgVVpT0 HjrAdelhtIKQ+nofPbYLbyvb/rY3JNlccOP6Z3/z4a5tMr93CkWfrop64XXvrMCW5qkKVknf bnzbcOS10FbTR8Hc3ctdHnDff/3st7Ps+5hzc2oDizUmdKyaE2Tx7ZAi48Zf0od/Od95fqA4 YbWNRV/aOfUpAcVXDYK3PmDlmLtx9jF3JZbijERDLeai4kQA71rFuUADAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140206_011602_374459_8F2B9E14 X-CRM114-Status: UNSURE ( 8.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.4 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-mtd@lists.infradead.org, 'Kyungmin Park' , 'Jingoo Han' , 'David Woodhouse' X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han --- drivers/mtd/onenand/onenand_base.c | 7 +------ drivers/mtd/onenand/samsung.c | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 531ccbc..e886d7a 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -3994,11 +3994,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) /* Allocate buffers, if necessary */ if (!this->page_buf) { this->page_buf = kzalloc(mtd->writesize, GFP_KERNEL); - if (!this->page_buf) { - printk(KERN_ERR "%s: Can't allocate page_buf\n", - __func__); + if (!this->page_buf) return -ENOMEM; - } #ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE this->verify_buf = kzalloc(mtd->writesize, GFP_KERNEL); if (!this->verify_buf) { @@ -4011,8 +4008,6 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) if (!this->oob_buf) { this->oob_buf = kzalloc(mtd->oobsize, GFP_KERNEL); if (!this->oob_buf) { - printk(KERN_ERR "%s: Can't allocate oob_buf\n", - __func__); if (this->options & ONENAND_PAGEBUF_ALLOC) { this->options &= ~ONENAND_PAGEBUF_ALLOC; kfree(this->page_buf); diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index df7400d..b1a792f 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -872,10 +872,8 @@ static int s3c_onenand_probe(struct platform_device *pdev) size = sizeof(struct mtd_info) + sizeof(struct onenand_chip); mtd = kzalloc(size, GFP_KERNEL); - if (!mtd) { - dev_err(&pdev->dev, "failed to allocate memory\n"); + if (!mtd) return -ENOMEM; - } onenand = kzalloc(sizeof(struct s3c_onenand), GFP_KERNEL); if (!onenand) {