Skip to content

Commit

Permalink
i2c-nomadik: remove the unnecessary delay
Browse files Browse the repository at this point in the history
The delay in the driver seems to be not needed, so remove it.

Signed-off-by: Virupax Sadashivpetimath <[email protected]>
Reviewed-by: Markus Grape <[email protected]>
Tested-by: Per Persson <[email protected]>
Tested-by: Chethan Krishna N <[email protected]>
Reviewed-by: Srinidhi Kasagar <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Ben Dooks <[email protected]>
  • Loading branch information
Virupax Sadashivpetimath authored and Ben Dooks committed May 24, 2011
1 parent 5535534 commit b5e890f
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions drivers/i2c/busses/i2c-nomadik.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -652,7 +642,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,

break;
}
udelay(I2C_DELAY);
}
if (status == 0)
break;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit b5e890f

Please sign in to comment.