mtd/drivers/mtd/maps edb7312.c,1.1,1.2 impa7.c,1.1,1.2

[acurtis at onz.com]

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv25199

Modified Files:
	edb7312.c impa7.c 
Log Message:
Removed 64-bit conditional code

Index: edb7312.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/edb7312.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edb7312.c	30 Apr 2002 13:12:04 -0000	1.1
+++ edb7312.c	5 Sep 2002 05:11:24 -0000	1.2
@@ -50,13 +50,6 @@
 	return __raw_readl(map->map_priv_1 + ofs);
 }
 
-#ifdef CFI_WORD_64
-__u64 edb7312nor_read64(struct map_info *map, unsigned long ofs)
-{
-	return __raw_readll(map->map_priv_1 + ofs);
-}
-#endif
-
 void edb7312nor_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
 {
 	memcpy_fromio(to, map->map_priv_1 + from, len);
@@ -80,14 +73,6 @@
 	mb();
 }
 
-#ifdef CFI_WORD_64
-void edb7312nor_write64(struct map_info *map, __u64 d, unsigned long adr)
-{
-	__raw_writell(d, map->map_priv_1 + adr);
-	mb();
-}
-#endif
-
 void edb7312nor_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
 {
 	memcpy_toio(map->map_priv_1 + to, from, len);
@@ -100,16 +85,10 @@
 	read8: edb7312nor_read8,
 	read16: edb7312nor_read16,
 	read32: edb7312nor_read32,
-#ifdef CFI_WORD_64
-	read64: edb7312nor_read64,
-#endif
 	copy_from: edb7312nor_copy_from,
 	write8: edb7312nor_write8,
 	write16: edb7312nor_write16,
 	write32: edb7312nor_write32,
-#ifdef CFI_WORD_64
-	write64: edb7312nor_write64,
-#endif
 	copy_to: edb7312nor_copy_to
 };
 

Index: impa7.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/impa7.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impa7.c	30 Apr 2002 15:11:47 -0000	1.1
+++ impa7.c	5 Sep 2002 05:11:24 -0000	1.2
@@ -52,13 +52,6 @@
 	return __raw_readl(map->map_priv_1 + ofs);
 }
 
-#ifdef CFI_WORD_64
-__u64 impa7_read64(struct map_info *map, unsigned long ofs)
-{
-	return __raw_readll(map->map_priv_1 + ofs);
-}
-#endif
-
 void impa7_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
 {
 	memcpy_fromio(to, map->map_priv_1 + from, len);
@@ -82,14 +75,6 @@
 	mb();
 }
 
-#ifdef CFI_WORD_64
-void impa7_write64(struct map_info *map, __u64 d, unsigned long adr)
-{
-	__raw_writell(d, map->map_priv_1 + adr);
-	mb();
-}
-#endif
-
 void impa7_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
 {
 	memcpy_toio(map->map_priv_1 + to, from, len);
@@ -103,16 +88,10 @@
 	read8: impa7_read8,
 	read16: impa7_read16,
 	read32: impa7_read32,
-#ifdef CFI_WORD_64
-	read64: impa7_read64,
-#endif
 	copy_from: impa7_copy_from,
 	write8: impa7_write8,
 	write16: impa7_write16,
 	write32: impa7_write32,
-#ifdef CFI_WORD_64
-	write64: impa7_write64,
-#endif
 	copy_to: impa7_copy_to
 	},
 	{
@@ -122,16 +101,10 @@
 	read8: impa7_read8,
 	read16: impa7_read16,
 	read32: impa7_read32,
-#ifdef CFI_WORD_64
-	read64: impa7_read64,
-#endif
 	copy_from: impa7_copy_from,
 	write8: impa7_write8,
 	write16: impa7_write16,
 	write32: impa7_write32,
-#ifdef CFI_WORD_64
-	write64: impa7_write64,
-#endif
 	copy_to: impa7_copy_to
 	},
 };