From dcfa3b9110fe2c762a2d7bada00e9e112d6ab05c Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 27 Jan 2008 18:14:47 +0100
Subject: [PATCH] --- yaml --- r: 77327 b: refs/heads/master c:
 2caeac810423556a5ee787d5cb7aa902fda13bb4 h: refs/heads/master i:   77325:
 d9a70184096395a5cb8f8ec04e07e55f38a28c16   77323:
 a69dc69c568ab7e556d54cf976ad94af096d3127   77319:
 0a50e12a9053ca41cdaac71cc4cf2b0b91017926   77311:
 543be86e07eb0441f8dbbcf4b0c165cf0b86482b v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/i2c/busses/i2c-davinci.c | 1 -
 trunk/drivers/i2c/busses/i2c-ibm_iic.c | 1 -
 trunk/drivers/i2c/busses/i2c-iop3xx.c  | 1 -
 trunk/drivers/i2c/busses/i2c-mpc.c     | 1 -
 trunk/drivers/i2c/busses/i2c-omap.c    | 2 --
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2d8720c28da6..e56adb60a192 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05c7abaeb344975a3257366a52368a4866aa518d
+refs/heads/master: 2caeac810423556a5ee787d5cb7aa902fda13bb4
diff --git a/trunk/drivers/i2c/busses/i2c-davinci.c b/trunk/drivers/i2c/busses/i2c-davinci.c
index 67679882ebef..cce5a614758d 100644
--- a/trunk/drivers/i2c/busses/i2c-davinci.c
+++ b/trunk/drivers/i2c/busses/i2c-davinci.c
@@ -510,7 +510,6 @@ static int davinci_i2c_probe(struct platform_device *pdev)
 
 	/* FIXME */
 	adap->timeout = 1;
-	adap->retries = 1;
 
 	adap->nr = pdev->id;
 	r = i2c_add_numbered_adapter(adap);
diff --git a/trunk/drivers/i2c/busses/i2c-ibm_iic.c b/trunk/drivers/i2c/busses/i2c-ibm_iic.c
index d0cf39b8c1f1..7c7eb0cfeceb 100644
--- a/trunk/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/trunk/drivers/i2c/busses/i2c-ibm_iic.c
@@ -736,7 +736,6 @@ static int __devinit iic_probe(struct ocp_device *ocp){
 	adap->client_register = NULL;
 	adap->client_unregister = NULL;
 	adap->timeout = 1;
-	adap->retries = 1;
 
 	/*
 	 * If "dev->idx" is negative we consider it as zero.
diff --git a/trunk/drivers/i2c/busses/i2c-iop3xx.c b/trunk/drivers/i2c/busses/i2c-iop3xx.c
index c70146e4c2c0..ab41400c883e 100644
--- a/trunk/drivers/i2c/busses/i2c-iop3xx.c
+++ b/trunk/drivers/i2c/busses/i2c-iop3xx.c
@@ -490,7 +490,6 @@ iop3xx_i2c_probe(struct platform_device *pdev)
 	 * Default values...should these come in from board code?
 	 */
 	new_adapter->timeout = 100;	
-	new_adapter->retries = 3;
 	new_adapter->algo = &iop3xx_i2c_algo;
 
 	init_waitqueue_head(&adapter_data->waitq);
diff --git a/trunk/drivers/i2c/busses/i2c-mpc.c b/trunk/drivers/i2c/busses/i2c-mpc.c
index d8de4ac88b7d..81335b76c425 100644
--- a/trunk/drivers/i2c/busses/i2c-mpc.c
+++ b/trunk/drivers/i2c/busses/i2c-mpc.c
@@ -309,7 +309,6 @@ static struct i2c_adapter mpc_ops = {
 	.algo = &mpc_algo,
 	.class = I2C_CLASS_HWMON,
 	.timeout = 1,
-	.retries = 1
 };
 
 static int fsl_i2c_probe(struct platform_device *pdev)
diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c
index f2552b19ea60..da6639707ea3 100644
--- a/trunk/drivers/i2c/busses/i2c-omap.c
+++ b/trunk/drivers/i2c/busses/i2c-omap.c
@@ -362,8 +362,6 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 
 	omap_i2c_enable_clocks(dev);
 
-	/* REVISIT: initialize and use adap->retries. This is an optional
-	 * feature */
 	if ((r = omap_i2c_wait_for_bb(dev)) < 0)
 		goto out;