From 24cd42ee8bac4382392165d3c9f7b5b18e6e27d2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 23 Apr 2003 21:13:08 -0700 Subject: [PATCH] [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 --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 065bdb63a0c8d..d3d8c0e925f60 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -618,8 +618,8 @@ int i2c_control(struct i2c_client *client, * ---------------------------------------------------- */ 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 @@ int i2c_probe(struct i2c_adapter *adapter, (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 @@ int i2c_probe(struct i2c_adapter *adapter, /* 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 --git a/include/linux/i2c.h b/include/linux/i2c.h index 12befd6bd7e0b..1797afd7289a4 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -338,12 +338,9 @@ extern int i2c_check_addr (struct i2c_adapter *adapter, int addr); * 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. */ -- 2.53.0