commit a60d1e5b8e5007f53c198acc5ca636ae570ae180
author Graeme Russ <graeme.russ@gmail.com> Fri Jul 15 23:31:37 2011 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Sat Jul 16 11:55:00 2011 +0200
tree ce621710efc0ecace5a53c22e93f4c6dfcf03be2
parent 4e0499ebb0ac53aca45735ed63a3230df3280fb8

Timer: Fix misuse of ARM *timer_masked() functions outside arch/arm

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>

drivers/mtd/spi/eeprom_m95xxx.c

diff --git a/drivers/mtd/spi/eeprom_m95xxx.c b/drivers/mtd/spi/eeprom_m95xxx.c
index 632db4e..ef8ed6f 100644
--- a/drivers/mtd/spi/eeprom_m95xxx.c
+++ b/drivers/mtd/spi/eeprom_m95xxx.c
@@ -75,6 +75,7 @@
 {
 	struct spi_slave *slave;
 	char buf[3];
+	ulong start;
 
 	slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000,
 			CONFIG_DEFAULT_SPI_MODE);
@@ -102,7 +103,7 @@
 	if(spi_xfer(slave, len * 8, buffer, NULL, SPI_XFER_END))
 		return -1;
 
-	reset_timer_masked();
+	start = get_timer(0);
 	do {
 		buf[0] = SPI_EEPROM_RDSR;
 		buf[1] = 0;
@@ -111,7 +112,7 @@
 		if (!(buf[1] & 1))
 			break;
 
-	} while (get_timer_masked() < CONFIG_SYS_SPI_WRITE_TOUT);
+	} while (get_timer(start) < CONFIG_SYS_SPI_WRITE_TOUT);
 
 	if (buf[1] & 1)
 		printf ("*** spi_write: Time out while writing!\n");