From 4a915dfee02f43b22f1f57d3f2843e06db932524 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sat, 12 Aug 2006 18:49:36 +0200 Subject: [GCC4] fix build error in drivers/i2c/i2c-core.c This patch fixes this error : In file included from i2c-core.c:32: /usr/src/git/linux-2.4/include/linux/i2c.h:73: error: array type has incomplete element type /usr/src/git/linux-2.4/include/linux/i2c.h:200: error: array type has incomplete element type i2c-core.c: In function 'i2c_transfer': i2c-core.c:732: error: type of formal parameter 2 is incomplete i2c-core.c: In function 'i2c_master_send': i2c-core.c:753: error: invalid lvalue in assignment i2c-core.c:759: error: type of formal parameter 2 is incomplete i2c-core.c: In function 'i2c_master_recv': i2c-core.c:789: error: type of formal parameter 2 is incomplete --- drivers/i2c/i2c-core.c | 4 ++-- include/linux/i2c.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 516f8f4..db3f1aa 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -720,7 +720,7 @@ #endif /* def CONFIG_PROC_FS */ * ---------------------------------------------------- */ -int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num) +int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs,int num) { int ret; @@ -750,7 +750,7 @@ int i2c_master_send(struct i2c_client *c msg.addr = client->addr; msg.flags = client->flags & I2C_M_TEN; msg.len = count; - (const char *)msg.buf = buf; + msg.buf = (char *)buf; DEB2(printk(KERN_DEBUG "i2c-core.o: master_send: writing %d bytes on %s.\n", count,client->adapter->name)); diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 87a6dd0..a1061eb 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -70,7 +70,7 @@ extern int i2c_master_recv(struct i2c_cl /* Transfer num messages. */ -extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num); +extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg,int num); /* * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. @@ -197,7 +197,7 @@ struct i2c_algorithm { to NULL. If an adapter algorithm can do SMBus access, set smbus_xfer. If set to NULL, the SMBus protocol is simulated using common I2C messages */ - int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], + int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, int num); int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, -- 1.4.2