Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5e890f7 authored by Virupax Sadashivpetimath's avatar Virupax Sadashivpetimath Committed by Ben Dooks
Browse files

i2c-nomadik: remove the unnecessary delay 



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

Signed-off-by: default avatarVirupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Reviewed-by: default avatarMarkus Grape <markus.grape@stericsson.com>
Tested-by: default avatarPer Persson <per.xb.persson@stericsson.com>
Tested-by: default avatarChethan Krishna N <chethan.krishna@stericsson.com>
Reviewed-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 55355341

drivers/i2c/busses/i2c-nomadik.c

+2 −18
Original line number Diff line number Diff line
@@ -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;