From patchwork Tue Oct 18 23:28:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 9383343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0293A607D0 for ; Tue, 18 Oct 2016 23:30:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5A3C284FA for ; Tue, 18 Oct 2016 23:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5F042985C; Tue, 18 Oct 2016 23:30:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 545AC284FA for ; Tue, 18 Oct 2016 23:30:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwdoV-0005N1-HK; Tue, 18 Oct 2016 23:28:55 +0000 Received: from resqmta-po-09v.sys.comcast.net ([2001:558:fe16:19:96:114:154:168]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwdoP-0005Kj-Aq for linux-arm-kernel@lists.infradead.org; Tue, 18 Oct 2016 23:28:50 +0000 Received: from resomta-po-08v.sys.comcast.net ([96.114.154.232]) by resqmta-po-09v.sys.comcast.net with SMTP id wdnSbHiEOS0FEwdo3bw93k; Tue, 18 Oct 2016 23:28:27 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-08v.sys.comcast.net with SMTP id wdo1bLbDVGiogwdo1bus3S; Tue, 18 Oct 2016 23:28:27 +0000 Received: from localhost.localdomain (shuah-xps.internal [192.168.1.87]) by mail.gonehiking.org (Postfix) with ESMTP id 422509F309; Tue, 18 Oct 2016 17:28:25 -0600 (MDT) From: Shuah Khan To: kyungmin.park@samsung.com, kamil@wypas.org, jtp.park@samsung.com, a.hajda@samsung.com, mchehab@kernel.org Subject: [PATCH] media: s5p-mfc collapse two error message into one Date: Tue, 18 Oct 2016 17:28:22 -0600 Message-Id: <20161018232822.17423-1-shuahkh@osg.samsung.com> X-Mailer: git-send-email 2.9.3 X-CMAE-Envelope: MS4wfA5iIu8ztvTBGXJHPmy/aGWvVp/W649XAYQ1tYlTgWNuch6W6rskvLgeN1fp7MCLtxCc/SQTyd71gB5sRiYQkfo6G0e/IPCRMslISQ21Tk4olnmva4fE qBhbtvq/d/5mRyYokcBHLCiByPGwm+E9FddQZ07rmw3/6WE2j0fOJ/gplM+KV8/ZEJZoNS0evMxM+nitNaiX85KquMnZNULRxLMbMNfCxk3S0GdJ+VTmSEWE 1XDU7VlOKI153Ji1mqz7YtPHCEVr1j0vhrh3oqn9hbuE2c1H9/Mr1mDDBLksYbjNJrmmU0B97CiEg0z6FSiGfXPrRzpnG3Sxt2PP+Z6zkreP3U9riRsSyldb IntTKCu5EUtyiFdXdx3v3aRcR/aMorvRuLWHeVgrSxagHPVHCayNYKuy3Dx0WeSt19FPXkcPH0RVH13rqVmz3bkc5mLb6enisLsO0blRpS7Ut8G2lzzN5/FE qUY2ONR1e0xExjGH X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161018_162849_455361_063C6E7A X-CRM114-Status: UNSURE ( 6.24 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, Shuah Khan , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP s5p_mfc_alloc_priv_buf() prints two message to report invalid memory configuration error. Collapse them into a single message. Signed-off-by: Shuah Khan --- drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c index eee16a1..44d2325 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c @@ -49,8 +49,7 @@ int s5p_mfc_alloc_priv_buf(struct device *dev, dma_addr_t base, } if (b->dma < base) { - mfc_err("Invaling memory configuration!\n"); - mfc_err("Allocated buffer (%pad) is lower than memory base address (%pad)\n", + mfc_err("Invalid memory configuration - buffer (%pad) is below base memory address(%pad)\n", &b->dma, &base); dma_free_coherent(dev, b->size, b->virt, b->dma); return -ENOMEM;