ChangeSet 1.1179.3.7, 2003/04/24 11:13:08-07:00, greg at kroah.com
[PATCH] i2c: removed unused flags paramater in found_proc callback.
drivers/i2c/i2c-core.c | 8 ++++----
include/linux/i2c.h | 5 +----
2 files changed, 5 insertions(+), 8 deletions(-)
diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
--- a/drivers/i2c/i2c-core.c Thu Apr 24 16:46:44 2003
+++ b/drivers/i2c/i2c-core.c Thu Apr 24 16:46:44 2003
@@ -618,8 +618,8 @@
* ----------------------------------------------------
*/
int i2c_probe(struct i2c_adapter *adapter,
- struct i2c_client_address_data *address_data,
- i2c_client_found_addr_proc *found_proc)
+ struct i2c_client_address_data *address_data,
+ int (*found_proc) (struct i2c_adapter *, int, int))
{
int addr,i,found,err;
int adap_id = i2c_adapter_id(adapter);
@@ -644,7 +644,7 @@
(addr == address_data->force[i+1])) {
DEB2(printk(KERN_DEBUG "i2c-core.o: found force parameter for adapter %d, addr %04x\n",
adap_id,addr));
- if ((err = found_proc(adapter,addr,0,0)))
+ if ((err = found_proc(adapter,addr,0)))
return err;
found = 1;
}
@@ -732,7 +732,7 @@
/* OK, so we really should examine this address. First check
whether there is some client here at all! */
if (i2c_smbus_xfer(adapter,addr,0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
- if ((err = found_proc(adapter,addr,0,-1)))
+ if ((err = found_proc(adapter,addr,-1)))
return err;
}
return 0;
diff -Nru a/include/linux/i2c.h b/include/linux/i2c.h
--- a/include/linux/i2c.h Thu Apr 24 16:46:44 2003
+++ b/include/linux/i2c.h Thu Apr 24 16:46:44 2003
@@ -338,12 +338,9 @@
* It will only call found_proc if some client is connected at the
* specific address (unless a 'force' matched);
*/
-typedef int i2c_client_found_addr_proc (struct i2c_adapter *adapter,
- int addr, unsigned short flags,int kind);
-
extern int i2c_probe(struct i2c_adapter *adapter,
struct i2c_client_address_data *address_data,
- i2c_client_found_addr_proc *found_proc);
+ int (*found_proc) (struct i2c_adapter *, int, int));
/* An ioctl like call to set div. parameters of the adapter.
*/
