Commit 24cd42ee authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Christoph Hellwig

[PATCH] i2c: removed unused flags paramater in found_proc callback.

parent 3371decd
...@@ -619,7 +619,7 @@ int i2c_control(struct i2c_client *client, ...@@ -619,7 +619,7 @@ int i2c_control(struct i2c_client *client,
*/ */
int i2c_probe(struct i2c_adapter *adapter, int i2c_probe(struct i2c_adapter *adapter,
struct i2c_client_address_data *address_data, struct i2c_client_address_data *address_data,
i2c_client_found_addr_proc *found_proc) int (*found_proc) (struct i2c_adapter *, int, int))
{ {
int addr,i,found,err; int addr,i,found,err;
int adap_id = i2c_adapter_id(adapter); int adap_id = i2c_adapter_id(adapter);
...@@ -644,7 +644,7 @@ int i2c_probe(struct i2c_adapter *adapter, ...@@ -644,7 +644,7 @@ int i2c_probe(struct i2c_adapter *adapter,
(addr == address_data->force[i+1])) { (addr == address_data->force[i+1])) {
DEB2(printk(KERN_DEBUG "i2c-core.o: found force parameter for adapter %d, addr %04x\n", DEB2(printk(KERN_DEBUG "i2c-core.o: found force parameter for adapter %d, addr %04x\n",
adap_id,addr)); adap_id,addr));
if ((err = found_proc(adapter,addr,0,0))) if ((err = found_proc(adapter,addr,0)))
return err; return err;
found = 1; found = 1;
} }
...@@ -732,7 +732,7 @@ int i2c_probe(struct i2c_adapter *adapter, ...@@ -732,7 +732,7 @@ int i2c_probe(struct i2c_adapter *adapter,
/* OK, so we really should examine this address. First check /* OK, so we really should examine this address. First check
whether there is some client here at all! */ whether there is some client here at all! */
if (i2c_smbus_xfer(adapter,addr,0,0,0,I2C_SMBUS_QUICK,NULL) >= 0) 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 err;
} }
return 0; return 0;
......
...@@ -338,12 +338,9 @@ extern int i2c_check_addr (struct i2c_adapter *adapter, int addr); ...@@ -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 * It will only call found_proc if some client is connected at the
* specific address (unless a 'force' matched); * 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, extern int i2c_probe(struct i2c_adapter *adapter,
struct i2c_client_address_data *address_data, 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. /* An ioctl like call to set div. parameters of the adapter.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment