From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752196AbbIOTmR (ORCPT ); Tue, 15 Sep 2015 15:42:17 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:58532 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751855AbbIOTld (ORCPT ); Tue, 15 Sep 2015 15:41:33 -0400 From: Stephen Boyd To: Andy Gross Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-soc@vger.kernel.org, Andrew Morton , Bjorn Andersson Subject: [PATCH 2/3] soc: qcom: smd: Use __ioread32_copy() instead of open-coding it Date: Tue, 15 Sep 2015 12:41:28 -0700 Message-Id: <1442346089-32077-3-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.3.0.rc1.33.g42e4583 In-Reply-To: <1442346089-32077-1-git-send-email-sboyd@codeaurora.org> References: <1442346089-32077-1-git-send-email-sboyd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we have a generic library function for this, replace the open-coded instance. Cc: Bjorn Andersson Signed-off-by: Stephen Boyd --- Note this patch relies on a previous patch on the list that changes the readl() to __raw_readl()[1]. drivers/soc/qcom/smd.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/soc/qcom/smd.c b/drivers/soc/qcom/smd.c index e2f85a714243..e81eac28b5ce 100644 --- a/drivers/soc/qcom/smd.c +++ b/drivers/soc/qcom/smd.c @@ -434,20 +434,15 @@ static void smd_copy_to_fifo(void __iomem *dst, /* * Copy count bytes of data using 32bit accesses, if that is required. */ -static void smd_copy_from_fifo(void *_dst, - const void __iomem *_src, +static void smd_copy_from_fifo(void *dst, + const void __iomem *src, size_t count, bool word_aligned) { - u32 *dst = (u32 *)_dst; - u32 *src = (u32 *)_src; - if (word_aligned) { - count /= sizeof(u32); - while (count--) - *dst++ = __raw_readl(src++); + __ioread32_copy(dst, src, count / sizeof(u32)); } else { - memcpy_fromio(_dst, _src, count); + memcpy_fromio(dst, src, count); } } -- [1] http://lkml.kernel.org/g/1441234011-4259-7-git-send-email-sboyd@codeaurora.org The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project