Patchwork [RESEND,1/2] MTD: autcpu12-nvram: Fix compile breakage

login
register
mail settings
Submitter Alexander Shiyan
Date Aug. 15, 2012, 4:28 p.m.
Message ID <1345048086-15709-1-git-send-email-shc_work@mail.ru>
Download mbox | patch
Permalink /patch/177730/
State New
Headers show

Comments

Alexander Shiyan - Aug. 15, 2012, 4:28 p.m.
Update driver autcpu12-nvram.c so it compiles. map_read32/map_write32
are no longer exist in the kernel so the driver is totally broken.
Additionally, map_info name passed to simple_map_init is incorrect.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/mtd/maps/autcpu12-nvram.c |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
Artem Bityutskiy - Aug. 17, 2012, 12:40 p.m.
On Wed, 2012-08-15 at 20:28 +0400, Alexander Shiyan wrote:
> Update driver autcpu12-nvram.c so it compiles. map_read32/map_write32
> are no longer exist in the kernel so the driver is totally broken.
> Additionally, map_info name passed to simple_map_init is incorrect.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Would you please send me a defconfig that I could use to compile-test
this driver?

Also, does this need Cc: stable@vger.kernel.org ?

Thanks!
Alexander Shiyan - Aug. 17, 2012, 2:51 p.m.
On Fri, 17 Aug 2012 15:40:55 +0300
Artem Bityutskiy <artem.bityutskiy@linux.intel.com> wrote:

> > Update driver autcpu12-nvram.c so it compiles. map_read32/map_write32
> > are no longer exist in the kernel so the driver is totally broken.
> > Additionally, map_info name passed to simple_map_init is incorrect.
> Would you please send me a defconfig that I could use to compile-test
> this driver?
Have been sent.
Artem Bityutskiy - Aug. 17, 2012, 3:40 p.m.
On Wed, 2012-08-15 at 20:28 +0400, Alexander Shiyan wrote:
> Update driver autcpu12-nvram.c so it compiles. map_read32/map_write32
> are no longer exist in the kernel so the driver is totally broken.
> Additionally, map_info name passed to simple_map_init is incorrect.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Pushed to l2-mtd.git, thanks!

I've also added "Cc: stable@vger.kernel.org", is this OK?
Alexander Shiyan - Aug. 17, 2012, 3:41 p.m.
Hello Artem.

On Fri, 17 Aug 2012 18:40:30 +0300
Artem Bityutskiy <dedekind1@gmail.com> wrote:
> > Update driver autcpu12-nvram.c so it compiles. map_read32/map_write32
> > are no longer exist in the kernel so the driver is totally broken.
> > Additionally, map_info name passed to simple_map_init is incorrect.
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> 
> Pushed to l2-mtd.git, thanks!

> I've also added "Cc: stable@vger.kernel.org", is this OK?
If patch approved and goes to stable why not?
Thanks!

Patch

diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index e5bfd0e..0598d52 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -43,7 +43,8 @@  struct map_info autcpu12_sram_map = {
 
 static int __init init_autcpu12_sram (void)
 {
-	int err, save0, save1;
+	map_word tmp, save0, save1;
+	int err;
 
 	autcpu12_sram_map.virt = ioremap(0x12000000, SZ_128K);
 	if (!autcpu12_sram_map.virt) {
@@ -51,7 +52,7 @@  static int __init init_autcpu12_sram (void)
 		err = -EIO;
 		goto out;
 	}
-	simple_map_init(&autcpu_sram_map);
+	simple_map_init(&autcpu12_sram_map);
 
 	/*
 	 * Check for 32K/128K
@@ -61,20 +62,22 @@  static int __init init_autcpu12_sram (void)
 	 * Read	and check result on ofs 0x0
 	 * Restore contents
 	 */
-	save0 = map_read32(&autcpu12_sram_map,0);
-	save1 = map_read32(&autcpu12_sram_map,0x10000);
-	map_write32(&autcpu12_sram_map,~save0,0x10000);
+	save0 = map_read(&autcpu12_sram_map, 0);
+	save1 = map_read(&autcpu12_sram_map, 0x10000);
+	tmp.x[0] = ~save0.x[0];
+	map_write(&autcpu12_sram_map, tmp, 0x10000);
 	/* if we find this pattern on 0x0, we have 32K size
 	 * restore contents and exit
 	 */
-	if ( map_read32(&autcpu12_sram_map,0) != save0) {
-		map_write32(&autcpu12_sram_map,save0,0x0);
+	tmp = map_read(&autcpu12_sram_map, 0);
+	if (!map_word_equal(&autcpu12_sram_map, tmp, save0)) {
+		map_write(&autcpu12_sram_map, save0, 0x0);
 		goto map;
 	}
 	/* We have a 128K found, restore 0x10000 and set size
 	 * to 128K
 	 */
-	map_write32(&autcpu12_sram_map,save1,0x10000);
+	map_write(&autcpu12_sram_map, save1, 0x10000);
 	autcpu12_sram_map.size = SZ_128K;
 
 map: