From patchwork Mon Aug 22 21:59:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 1086542 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7MLi5NB024667 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 22 Aug 2011 21:44:25 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QvcHc-0005OR-UZ; Mon, 22 Aug 2011 21:43:49 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QvcHc-0005bq-Eh; Mon, 22 Aug 2011 21:43:48 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QvcH8-0005W3-Vz for linux-arm-kernel@lists.infradead.org; Mon, 22 Aug 2011 21:43:20 +0000 Received: from epcpsbgm2.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LQC0019SN019P60@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 23 Aug 2011 06:43:15 +0900 (KST) X-AuditID: cbfee61b-b7b7fae000005864-28-4e52cd732c92 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id FD.37.22628.37DC25E4; Tue, 23 Aug 2011 06:43:15 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LQC00M1CMZXIN@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 23 Aug 2011 06:43:15 +0900 (KST) Date: Tue, 23 Aug 2011 03:29:44 +0530 From: Thomas Abraham Subject: [PATCH 2/3] ARM: SAMSUNG: Modify pl330 channel filter function In-reply-to: <1314050385-9617-2-git-send-email-thomas.abraham@linaro.org> To: linux-arm-kernel@lists.infradead.org Message-id: <1314050385-9617-3-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 References: <1314050385-9617-1-git-send-email-thomas.abraham@linaro.org> <1314050385-9617-2-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110822_174319_409736_6972BC4C X-CRM114-Status: GOOD ( 13.91 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.25 listed in list.dnswl.org] Cc: vinod.koul@intel.com, kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 22 Aug 2011 21:44:25 +0000 (UTC) With the change in dma channels private data information, the pl330 channel filter function is modified to look for a simple u8 value instead of the now unused 'struct dma_pl330_peri' value. Signed-off-by: Thomas Abraham --- arch/arm/plat-samsung/dma-ops.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 6e3d9ab..4f1430b 100644 --- a/arch/arm/plat-samsung/dma-ops.c +++ b/arch/arm/plat-samsung/dma-ops.c @@ -19,8 +19,8 @@ static inline bool pl330_filter(struct dma_chan *chan, void *param) { - struct dma_pl330_peri *peri = chan->private; - return peri->peri_id == (unsigned)param; + u8 *peri_id = chan->private; + return *peri_id == (unsigned)param; } static unsigned samsung_dmadev_request(enum dma_ch dma_ch,