Remove unused #define and function declaration

Corresponding to flashrom svn r17 and coreboot v2 svn r1459.

7 files changed, 4 insertions, 25 deletions

diff --git a/jedec.c b/jedec.c
index d7f2bef1..bae1ddc4 100644
--- a/jedec.c
+++ b/jedec.c
@@ -141,15 +141,16 @@ void write_page_jedec(volatile char *bios, char *src, volatile char *dst,
 
 int write_sector_jedec(volatile char *bios,
 		       unsigned char *src,
-		       volatile unsigned char *dst, unsigned int page_size)
+		       volatile unsigned char *dst,
+		       unsigned int page_size)
 {
 	int i;
 	volatile char *Temp;
 
 	for (i = 0; i < page_size; i++) {
 		if (*dst != 0xff) {
-			printf("FATAL: dst %p not erased (val 0x%x\n", dst,
-			       *dst);
+			printf("FATAL: dst %p not erased (val 0x%x)\n",
+			       dst, *dst);
 			return (-1);
 		}
 		/* transfer data from source to destination */
diff --git a/jedec.h b/jedec.h
index b62223b1..1751b296 100644
--- a/jedec.h
+++ b/jedec.h
@@ -62,5 +62,4 @@ extern __inline__ void protect_jedec(volatile char *bios)
 	usleep(200);
 }
 
-
 #endif				/* !__JEDEC_H__ */
diff --git a/pm49fl004.c b/pm49fl004.c
index e0bd6aaa..4cffc14b 100644
--- a/pm49fl004.c
+++ b/pm49fl004.c
@@ -26,11 +26,6 @@
 #include "jedec.h"
 #include "pm49fl004.h"
 
-#define AUTO_PGRM		0x10
-#define CHIP_ERASE		0x30
-#define RESET			0xFF
-#define READ_ID			0x90
-
 static __inline__ int erase_block_49fl004(volatile unsigned char *bios,
 					  unsigned long address)
 {
diff --git a/sst39sf020.c b/sst39sf020.c
index 25d141a3..401247a6 100644
--- a/sst39sf020.c
+++ b/sst39sf020.c
@@ -34,10 +34,6 @@
 
 #define AUTO_PG_ERASE1		0x20
 #define AUTO_PG_ERASE2		0xD0
-#define AUTO_PGRM		0x10
-#define CHIP_ERASE		0x30
-#define RESET			0xFF
-#define READ_ID			0x90
 
 static __inline__ int erase_sector_39sf020(volatile char *bios,
 					   unsigned long address)
diff --git a/sst49lf040.c b/sst49lf040.c
index ace2f1ae..f18e733e 100644
--- a/sst49lf040.c
+++ b/sst49lf040.c
@@ -30,14 +30,6 @@
 #include "jedec.h"
 #include "sst49lf040.h"
 
-#define AUTO_PG_ERASE1		0x20
-#define AUTO_PG_ERASE2		0xD0
-#define AUTO_PGRM		0x10
-#define CHIP_ERASE		0x30
-#define RESET			0xFF
-#define READ_ID			0x90
-
-
 int write_49lf040(struct flashchip *flash, unsigned char *buf)
 {
 	int i;
diff --git a/sst49lf040.h b/sst49lf040.h
index a6650150..9e3cfa42 100644
--- a/sst49lf040.h
+++ b/sst49lf040.h
@@ -1,8 +1,6 @@
 #ifndef __SST49LF040_H__
 #define __SST49LF040_H__ 1
 
-extern int probe_49lf040(struct flashchip *flash);
-extern int erase_49lf040(struct flashchip *flash);
 extern int write_49lf040(struct flashchip *flash, unsigned char *buf);
 
 #endif				/* !__SST49LF040_H__ */
diff --git a/w49f002u.h b/w49f002u.h
index 4863ea5a..29320b7c 100644
--- a/w49f002u.h
+++ b/w49f002u.h
@@ -1,8 +1,6 @@
 #ifndef __W49F002U_H__
 #define __W49F002U_H__ 1
 
-extern int probe_49f002(struct flashchip *flash);
-extern int erase_49f002(struct flashchip *flash);
 extern int write_49f002(struct flashchip *flash, unsigned char *buf);
 
 #endif				/* !__W49F002U_H__ */