summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/i2c/i2c-sensor.c4
-rw-r--r--include/linux/i2c-sensor.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c
index 2e8a0eda48cd..b844e7b0bbda 100644
--- a/drivers/i2c/i2c-sensor.c
+++ b/drivers/i2c/i2c-sensor.c
@@ -35,8 +35,8 @@
/* Very inefficient for ISA detects, and won't work for 10-bit addresses! */
int i2c_detect(struct i2c_adapter *adapter,
- struct i2c_address_data *address_data,
- i2c_found_addr_proc * found_proc)
+ struct i2c_address_data *address_data,
+ int (*found_proc) (struct i2c_adapter *, int, int))
{
int addr, i, found, j, err;
struct i2c_force_data *this_force;
diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h
index a3181c83a750..fc1785648205 100644
--- a/include/linux/i2c-sensor.h
+++ b/include/linux/i2c-sensor.h
@@ -315,16 +315,13 @@ struct i2c_address_data {
{NULL}}; \
SENSORS_INSMOD
-typedef int i2c_found_addr_proc(struct i2c_adapter *adapter,
- int addr, int kind);
-
/* Detect function. It iterates over all possible addresses itself. For
SMBus addresses, it will only call found_proc if some client is connected
to the SMBus (unless a 'force' matched); for ISA detections, this is not
done. */
extern int i2c_detect(struct i2c_adapter *adapter,
- struct i2c_address_data *address_data,
- i2c_found_addr_proc * found_proc);
+ struct i2c_address_data *address_data,
+ int (*found_proc) (struct i2c_adapter *, int, int));
/* This macro is used to scale user-input to sensible values in almost all