---

yaml --- r: 77532 b: refs/heads/master c: 2f0a8df h: refs/heads/master v: v3
git-mirror · Jan 26, 2008 · cca4f7d · cca4f7d
1 parent 54ed97e
commit cca4f7d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0832798c05241f15e793805b6024919c07b8292
+refs/heads/master: 2f0a8df40ff008822e5570b3323c56622cd92c95
diff --git a/trunk/arch/powerpc/sysdev/mv64x60_dev.c b/trunk/arch/powerpc/sysdev/mv64x60_dev.c
@@ -361,12 +361,6 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id)
 	else
 		pdata.timeout = 1000;	/* 1 second */
 
-	prop = of_get_property(np, "retries", NULL);
-	if (prop)
-		pdata.retries = *prop;
-	else
-		pdata.retries = 1;
-
 	pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
 	if (!pdev)
 		return -ENOMEM;

diff --git a/trunk/arch/ppc/syslib/mv64x60.c b/trunk/arch/ppc/syslib/mv64x60.c
@@ -411,7 +411,6 @@ static struct mv64xxx_i2c_pdata mv64xxx_i2c_pdata = {
 	.freq_m			= 8,
 	.freq_n			= 3,
 	.timeout		= 1000, /* Default timeout of 1 second */
-	.retries		= 1,
 };
 
 static struct resource mv64xxx_i2c_resources[] = {

diff --git a/trunk/drivers/i2c/busses/i2c-mv64xxx.c b/trunk/drivers/i2c/busses/i2c-mv64xxx.c
@@ -532,7 +532,6 @@ mv64xxx_i2c_probe(struct platform_device *pd)
 	drv_data->adapter.owner = THIS_MODULE;
 	drv_data->adapter.class = I2C_CLASS_HWMON;
 	drv_data->adapter.timeout = pdata->timeout;
-	drv_data->adapter.retries = pdata->retries;
 	drv_data->adapter.nr = pd->id;
 	platform_set_drvdata(pd, drv_data);
 	i2c_set_adapdata(&drv_data->adapter, drv_data);

diff --git a/trunk/include/linux/mv643xx_i2c.h b/trunk/include/linux/mv643xx_i2c.h
@@ -17,7 +17,6 @@ struct mv64xxx_i2c_pdata {
 	u32	freq_m;
 	u32	freq_n;
 	u32	timeout;	/* In milliseconds */
-	u32	retries;
 };
 
 #endif /*_MV64XXX_I2C_H_*/