From 06c80fa749ab67363708b6a1c49f492680482e90 Mon Sep 17 00:00:00 2001
From: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Date: Fri, 13 May 2011 12:30:42 +0200
Subject: [PATCH] --- yaml --- r: 250847 b: refs/heads/master c:
 b5e890f7e70707d1e10e8d4844806d2223e8b36d h: refs/heads/master i:   250845:
 22b5c5917f61b8dd8b00dff8599f5d4b4a062a0f   250843:
 c5b356f6741af8e5623be183f5a3d3928b503d84   250839:
 9ae63951d1467306f1be918da714e08fb233d457   250831:
 3f7c47c33dd8cbbfd9e621cab016990c03b445a3   250815:
 f014aeba41a01727a3025fdac7207dfb4d604ad2 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/i2c/busses/i2c-nomadik.c | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index c3a5345645c7..22830bd37c42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 553553413a6abdda220a697ef439ba2f4b1d4a7c
+refs/heads/master: b5e890f7e70707d1e10e8d4844806d2223e8b36d
diff --git a/trunk/drivers/i2c/busses/i2c-nomadik.c b/trunk/drivers/i2c/busses/i2c-nomadik.c
index e3cd62e40df5..b2de1a56dc8d 100644
--- a/trunk/drivers/i2c/busses/i2c-nomadik.c
+++ b/trunk/drivers/i2c/busses/i2c-nomadik.c
@@ -15,7 +15,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
@@ -105,9 +104,6 @@
 /* maximum threshold value */
 #define MAX_I2C_FIFO_THRESHOLD	15
 
-/* per-transfer delay, required for the hardware to stabilize */
-#define I2C_DELAY		150
-
 enum i2c_status {
 	I2C_NOP,
 	I2C_ON_GOING,
@@ -269,12 +265,6 @@ static int init_hw(struct nmk_i2c_dev *dev)
 	dev->cli.operation = I2C_NO_OPERATION;
 
 exit:
-	/*
-	 * TODO: What is this delay for?
-	 * Must be pretty pointless since the hw block
-	 * is frozen. Or?
-	 */
-	udelay(I2C_DELAY);
 	return stat;
 }
 
@@ -652,7 +642,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
 
 				break;
 			}
-			udelay(I2C_DELAY);
 		}
 		if (status == 0)
 			break;
@@ -778,13 +767,8 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
 			}
 		}
 
-		i2c_set_bit(dev->virtbase + I2C_ICR, I2C_IT_MTD);
-		i2c_set_bit(dev->virtbase + I2C_ICR, I2C_IT_MTDWS);
-
-		disable_interrupts(dev,
-				(I2C_IT_TXFNE | I2C_IT_TXFE | I2C_IT_TXFF
-					| I2C_IT_TXFOVR | I2C_IT_RXFNF
-					| I2C_IT_RXFF | I2C_IT_RXFE));
+		disable_all_interrupts(dev);
+		clear_all_interrupts(dev);
 
 		if (dev->cli.count) {
 			dev->result = -EIO;