---

yaml
---
r: 77327
b: refs/heads/master
c: 2caeac8
h: refs/heads/master
i:
  77325: d9a7018
  77323: a69dc69
  77319: 0a50e12
  77311: 543be86
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05c7abaeb344975a3257366a52368a4866aa518d
+refs/heads/master: 2caeac810423556a5ee787d5cb7aa902fda13bb4

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);

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.

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);

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)

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;