X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-sa1100%2Fssp.c;h=1604dadf27fc3e8864fd330bbeef0077712dc260;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=5eba5fbbb561757ceb6a267b05eceade86d6b865;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c
index 5eba5fbbb..1604dadf2 100644
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -23,8 +23,6 @@
 #include <asm/hardware.h>
 #include <asm/hardware/ssp.h>
 
-#define TIMEOUT 100000
-
 static irqreturn_t ssp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	unsigned int status = Ser4SSSR;
@@ -49,27 +47,18 @@ static irqreturn_t ssp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
  * The caller is expected to perform the necessary locking.
  *
  * Returns:
- *   %-ETIMEDOUT	timeout occurred
+ *   %-ETIMEDOUT	timeout occurred (for future)
  *   0			success
  */
 int ssp_write_word(u16 data)
 {
-	int timeout = TIMEOUT;
-
-	while (!(Ser4SSSR & SSSR_TNF)) {
-	        if (!--timeout)
-	        	return -ETIMEDOUT;
+	while (!(Ser4SSSR & SSSR_TNF))
 		cpu_relax();
-	}
 
 	Ser4SSDR = data;
 
-	timeout = TIMEOUT;
-	while (!(Ser4SSSR & SSSR_BSY)) {
-	        if (!--timeout)
-	        	return -ETIMEDOUT;
+	while (!(Ser4SSSR & SSSR_BSY))
 		cpu_relax();
-	}
 
 	return 0;
 }
@@ -86,22 +75,15 @@ int ssp_write_word(u16 data)
  * The caller is expected to perform the necessary locking.
  *
  * Returns:
- *   %-ETIMEDOUT	timeout occurred
+ *   %-ETIMEDOUT	timeout occurred (for future)
  *   16-bit data	success
  */
-int ssp_read_word(u16 *data)
+int ssp_read_word(void)
 {
-	int timeout = TIMEOUT;
-
-	while (!(Ser4SSSR & SSSR_RNE)) {
-	        if (!--timeout)
-	        	return -ETIMEDOUT;
+	while (!(Ser4SSSR & SSSR_RNE))
 		cpu_relax();
-	}
-
-	*data = (u16)Ser4SSDR;
 
-	return 0;
+	return Ser4SSDR;
 }
 
 /**
@@ -111,26 +93,14 @@ int ssp_read_word(u16 *data)
  * is empty.
  *
  * The caller is expected to perform the necessary locking.
- *
- * Returns:
- *   %-ETIMEDOUT	timeout occurred
- *   0			success
  */
-int ssp_flush(void)
+void ssp_flush(void)
 {
-	int timeout = TIMEOUT * 2;
-
 	do {
 		while (Ser4SSSR & SSSR_RNE) {
-		        if (!--timeout)
-		        	return -ETIMEDOUT;
 			(void) Ser4SSDR;
 		}
-	        if (!--timeout)
-	        	return -ETIMEDOUT;
 	} while (Ser4SSSR & SSSR_BSY);
-
-	return 0;
 }
 
 /**