Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i2c-nomadik: remove the unnecessary delay

Browse source 
The delay in the driver seems to be not needed, so remove it.

Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Reviewed-by: Markus Grape <markus.grape@stericsson.com>
Tested-by: Per Persson <per.xb.persson@stericsson.com>
Tested-by: Chethan Krishna N <chethan.krishna@stericsson.com>
Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Virupax Sadashivpetimath 2011-05-13 12:30:42 +02:00 • committed by Ben Dooks
parent 553553413a
commit b5e890f7e7
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/i2c/busses/i2c-nomadik.c
View file

@ -15,7 +15,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -105,9 +104,6 @@
/* maximum threshold value */ /* maximum threshold value */
#define MAX_I2C_FIFO_THRESHOLD 15 #define MAX_I2C_FIFO_THRESHOLD 15
/* per-transfer delay, required for the hardware to stabilize */
#define I2C_DELAY 150
enum i2c_status { enum i2c_status {
I2C_NOP, I2C_NOP,
I2C_ON_GOING, I2C_ON_GOING,
@ -269,12 +265,6 @@ static int init_hw(struct nmk_i2c_dev *dev)
dev->cli.operation = I2C_NO_OPERATION; dev->cli.operation = I2C_NO_OPERATION;
exit: exit:
/*
* TODO: What is this delay for?
* Must be pretty pointless since the hw block
* is frozen. Or?
*/
udelay(I2C_DELAY);
return stat; return stat;
} }
@ -652,7 +642,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
break; break;
} }
udelay(I2C_DELAY);
} }
if (status == 0) if (status == 0)
break; 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); disable_all_interrupts(dev);
i2c_set_bit(dev->virtbase + I2C_ICR, I2C_IT_MTDWS); clear_all_interrupts(dev);
disable_interrupts(dev,
(I2C_IT_TXFNE | I2C_IT_TXFE | I2C_IT_TXFF
| I2C_IT_TXFOVR | I2C_IT_RXFNF
| I2C_IT_RXFF | I2C_IT_RXFE));
if (dev->cli.count) { if (dev->cli.count) {
dev->result = -EIO; dev->result = -EIO;