Re: Error compiling ieee1394/pcilynx.c (2.5.54)

[Adrian Bunk <bunk@fs.tum.de>]

On Wed, Jan 15, 2003 at 04:11:10PM -0800, Tariq Shureih wrote:
>...
> The pcilynx.c driver will not compile giving the following error.
> I enabled I2C bit-bangin options as required by the driver.
> 
> Seems that the driver requires porting to 2.5.x since the i2c structures
> and implementation has changed in 2.5.x.
> 
> Anyone working on this?  I can't proceed with my work not having this
> compile.

Below is the fix (already sent to Ben Collins).

> Thanx

cu
Adrian

--- linux-2.5.54/drivers/ieee1394/pcilynx.c.old	2003-01-03 06:58:52.000000000 +0100
+++ linux-2.5.54/drivers/ieee1394/pcilynx.c	2003-01-03 07:02:47.000000000 +0100
@@ -127,23 +127,20 @@
 }
 
 static struct i2c_algo_bit_data bit_data = {
-	NULL,
-	bit_setsda,
-	bit_setscl,
-	bit_getsda,
-	bit_getscl,
-	5, 5, 100,		/*	waits, timeout */
+	.setsda			= bit_setsda,
+	.setscl			= bit_setscl,
+	.getsda			= bit_getsda,
+	.getscl			= bit_getscl,
+	.udelay			= 5,
+	.mdelay			= 5,
+	.timeout		= 100,
 }; 
 
 static struct i2c_adapter bit_ops = {
-	"PCILynx I2C adapter",
-	0xAA, //FIXME: probably we should get an id in i2c-id.h
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	bit_reg,
-	bit_unreg,
+	.name			= "PCILynx I2C adapter",
+	.id 			= 0xAA, //FIXME: probably we should get an id in i2c-id.h
+	.client_register	= bit_reg,
+	.client_unregister	= bit_unreg,
 };