summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm47xx
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-12-10 11:49:53 +0100
committerRalf Baechle <ralf@linux-mips.org>2015-04-01 17:21:58 +0200
commit23d2bc42aceb829eaf90c694941e4523c22865e8 (patch)
treebce78c277552c39b36163e099941359e9b2029f4 /arch/mips/bcm47xx
parentaa816c1b390aacb698dd6faf5a8cbffb5123c03a (diff)
downloadlinux-23d2bc42aceb829eaf90c694941e4523c22865e8.tar.bz2
MIPS: BCM47XX: Use helpers for reading NVRAM content
Also drop some unneeded memset-s. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Cc: Paul Walmsley <paul@pwsan.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/8661/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/bcm47xx')
-rw-r--r--arch/mips/bcm47xx/nvram.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index c5c381c43f17..5e4ae042deb9 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -91,7 +91,6 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
return -ENXIO;
found:
-
if (header->len > size)
pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
if (header->len > NVRAM_SPACE)
@@ -101,10 +100,9 @@ found:
src = (u32 *) header;
dst = (u32 *) nvram_buf;
for (i = 0; i < sizeof(struct nvram_header); i += 4)
- *dst++ = *src++;
+ *dst++ = __raw_readl(src++);
for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
- *dst++ = le32_to_cpu(*src++);
- memset(dst, 0x0, NVRAM_SPACE - i);
+ *dst++ = readl(src++);
return 0;
}
@@ -165,7 +163,6 @@ static int nvram_init(void)
err = mtd_read(mtd, from, len, &bytes_read, dst);
if (err)
return err;
- memset(dst + bytes_read, 0x0, NVRAM_SPACE - bytes_read);
return 0;
}