From 9879b3b737f73e3d8d22eab871d4642bf2fa6d5d Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 31 Jul 2005 21:36:24 +0200 Subject: [PATCH] --- yaml --- r: 7172 b: refs/heads/master c: b78ec31582c60578ee1d3bb470791d6dde96ccf7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-sensor-detect.c | 2 +- trunk/include/linux/i2c-sensor.h | 30 +++------------------------ 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 647759ee6fd3..67a2fce1d9d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef8dec5d8b3e96e359f377f35cd8caff42fe6d58 +refs/heads/master: b78ec31582c60578ee1d3bb470791d6dde96ccf7 diff --git a/trunk/drivers/i2c/i2c-sensor-detect.c b/trunk/drivers/i2c/i2c-sensor-detect.c index c952926c1482..70fcf7281988 100644 --- a/trunk/drivers/i2c/i2c-sensor-detect.c +++ b/trunk/drivers/i2c/i2c-sensor-detect.c @@ -28,7 +28,7 @@ static unsigned short empty[] = {I2C_CLIENT_END}; /* Won't work for 10-bit addresses! */ int i2c_detect(struct i2c_adapter *adapter, - struct i2c_address_data *address_data, + struct i2c_client_address_data *address_data, int (*found_proc) (struct i2c_adapter *, int, int)) { int addr, i, found, j, err; diff --git a/trunk/include/linux/i2c-sensor.h b/trunk/include/linux/i2c-sensor.h index 4facaa0b9054..fc9284af9fae 100644 --- a/trunk/include/linux/i2c-sensor.h +++ b/trunk/include/linux/i2c-sensor.h @@ -22,31 +22,7 @@ #ifndef _LINUX_I2C_SENSOR_H #define _LINUX_I2C_SENSOR_H -/* A structure containing the detect information. - normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_END. - A list of I2C addresses which should normally be examined. - probe: insmod parameter. Initialize this list with I2C_CLIENT_END values. - A list of pairs. The first value is a bus number (ANY_I2C_BUS for any - I2C bus), the second is the address. These addresses are also probed, - as if they were in the 'normal' list. - ignore: insmod parameter. Initialize this list with I2C_CLIENT_END values. - A list of pairs. The first value is a bus number (ANY_I2C_BUS for any - I2C bus), the second is the I2C address. These addresses are never - probed. This parameter overrules 'normal' and probe', but not the - 'force' lists. - forces: insmod parameters. A list, ending with a NULL element. - Force variables overrule all other variables; they force a detection on - that place. If a specific chip is given, the module blindly assumes this - chip type is present; if a general force (kind == 0) is given, the module - will still try to figure out what type of chip is present. This is useful - if for some reasons the detect for SMBus address space filled fails. -*/ -struct i2c_address_data { - unsigned short *normal_i2c; - unsigned short *probe; - unsigned short *ignore; - unsigned short **forces; -}; +#include #define SENSORS_MODULE_PARM_FORCE(name) \ I2C_CLIENT_MODULE_PARM(force_ ## name, \ @@ -60,7 +36,7 @@ struct i2c_address_data { "List of adapter,address pairs to scan additionally"); \ I2C_CLIENT_MODULE_PARM(ignore, \ "List of adapter,address pairs not to scan"); \ - static struct i2c_address_data addr_data = { \ + static struct i2c_client_address_data addr_data = { \ .normal_i2c = normal_i2c, \ .probe = probe, \ .ignore = ignore, \ @@ -228,7 +204,7 @@ struct i2c_address_data { SMBus addresses, it will only call found_proc if some client is connected to the SMBus (unless a 'force' matched). */ extern int i2c_detect(struct i2c_adapter *adapter, - struct i2c_address_data *address_data, + struct i2c_client_address_data *address_data, int (*found_proc) (struct i2c_adapter *, int, int)); #endif /* def _LINUX_I2C_SENSOR_H */