From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: [PATCH v2 3/3] FIRMWARE: bcm47xx_nvram: Use __ioread32_copy() instead of open-coding Date: Thu, 17 Sep 2015 12:02:11 -0700 Message-ID: <1442516531-16071-4-git-send-email-sboyd@codeaurora.org> References: <1442516531-16071-1-git-send-email-sboyd@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1442516531-16071-1-git-send-email-sboyd@codeaurora.org> Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Andy Gross Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Andrew Morton , Bjorn Andersson , Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Paul Walmsley , linux-mips@linux-mips.org List-Id: linux-arm-msm@vger.kernel.org Now that we have a generic library function for this, replace the open-coded instance. Cc: Hauke Mehrtens Cc: Rafa=C5=82 Mi=C5=82ecki Cc: Paul Walmsley Cc: linux-mips@linux-mips.org Signed-off-by: Stephen Boyd --- drivers/firmware/broadcom/bcm47xx_nvram.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmwa= re/broadcom/bcm47xx_nvram.c index e41594510b97..8f46e6e394b1 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c @@ -56,9 +56,7 @@ static u32 find_nvram_size(void __iomem *end) static int nvram_find_and_copy(void __iomem *iobase, u32 lim) { struct nvram_header __iomem *header; - int i; u32 off; - u32 *src, *dst; u32 size; =20 if (nvram_len) { @@ -95,10 +93,7 @@ static int nvram_find_and_copy(void __iomem *iobase,= u32 lim) return -ENXIO; =20 found: - src =3D (u32 *)header; - dst =3D (u32 *)nvram_buf; - for (i =3D 0; i < sizeof(struct nvram_header); i +=3D 4) - *dst++ =3D __raw_readl(src++); + __ioread32_copy(nvram_buf, header, sizeof(*header) / 4); header =3D (struct nvram_header *)nvram_buf; nvram_len =3D header->len; if (nvram_len > size) { @@ -111,8 +106,8 @@ found: nvram_len =3D NVRAM_SPACE - 1; } /* proceed reading data after header */ - for (; i < nvram_len; i +=3D 4) - *dst++ =3D readl(src++); + __ioread32_copy(nvram_buf + sizeof(*header), header + 1, + DIV_ROUND_UP(nvram_len / 4)); nvram_buf[NVRAM_SPACE - 1] =3D '\0'; =20 return 0; --=20 The Qualcomm Innovation Center, Inc. is a member of the Code Aurora For= um, a Linux Foundation Collaborative Project