From 3304b10611a813f8f9e80b1f2a26ceafd9446364 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Mon, 9 Jul 2012 17:03:18 -0700
Subject: [PATCH] --- yaml --- r: 318012 b: refs/heads/master c:
 4a53ffae6afc94bab803087245b3b45e712c21c8 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/pstore/ram_core.c       | 7 +++----
 trunk/include/linux/pstore_ram.h | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6fb010d4e2cf..4ec74ad57641 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d761074bfa05c763353c265aea3e8781f733a03e
+refs/heads/master: 4a53ffae6afc94bab803087245b3b45e712c21c8
diff --git a/trunk/fs/pstore/ram_core.c b/trunk/fs/pstore/ram_core.c
index a5a7b13d358c..3f4d6e64f6d7 100644
--- a/trunk/fs/pstore/ram_core.c
+++ b/trunk/fs/pstore/ram_core.c
@@ -177,14 +177,14 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz)
 	struct persistent_ram_buffer *buffer = prz->buffer;
 	int ecc_blocks;
 	size_t ecc_total;
+	int ecc_symsize = 8;
+	int ecc_poly = 0x11d;
 
 	if (!prz->ecc)
 		return 0;
 
 	prz->ecc_block_size = 128;
 	prz->ecc_size = 16;
-	prz->ecc_symsize = 8;
-	prz->ecc_poly = 0x11d;
 
 	ecc_blocks = DIV_ROUND_UP(prz->buffer_size, prz->ecc_block_size);
 	ecc_total = (ecc_blocks + 1) * prz->ecc_size;
@@ -202,8 +202,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz)
 	 * first consecutive root is 0
 	 * primitive element to generate roots = 1
 	 */
-	prz->rs_decoder = init_rs(prz->ecc_symsize, prz->ecc_poly, 0, 1,
-				  prz->ecc_size);
+	prz->rs_decoder = init_rs(ecc_symsize, ecc_poly, 0, 1, prz->ecc_size);
 	if (prz->rs_decoder == NULL) {
 		pr_info("persistent_ram: init_rs failed\n");
 		return -EINVAL;
diff --git a/trunk/include/linux/pstore_ram.h b/trunk/include/linux/pstore_ram.h
index e681af92c04b..a0975c02194a 100644
--- a/trunk/include/linux/pstore_ram.h
+++ b/trunk/include/linux/pstore_ram.h
@@ -41,8 +41,6 @@ struct persistent_ram_zone {
 	int bad_blocks;
 	int ecc_block_size;
 	int ecc_size;
-	int ecc_symsize;
-	int ecc_poly;
 
 	char *old_log;
 	size_t old_log_size;