We now have two identical structures, i2c_address_data in i2c-sensor.h
and i2c_client_address_data in i2c.h. We can kill one of them, I choose
to keep the one in i2c.h as it makes more sense (this structure is not
specific to sensors.)
Signed-off-by: Jean Delvare <[email protected]>
drivers/i2c/i2c-sensor-detect.c | 2 +-
include/linux/i2c-sensor.h | 30 +++---------------------------
2 files changed, 4 insertions(+), 28 deletions(-)
--- linux-2.6.13-rc4.orig/drivers/i2c/i2c-sensor-detect.c 2005-07-31 16:07:56.000000000 +0200
+++ linux-2.6.13-rc4/drivers/i2c/i2c-sensor-detect.c 2005-07-31 20:56:02.000000000 +0200
@@ -28,7 +28,7 @@
/* 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;
--- linux-2.6.13-rc4.orig/include/linux/i2c-sensor.h 2005-07-31 16:07:56.000000000 +0200
+++ linux-2.6.13-rc4/include/linux/i2c-sensor.h 2005-07-31 20:56:02.000000000 +0200
@@ -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 <linux/i2c.h>
#define SENSORS_MODULE_PARM_FORCE(name) \
I2C_CLIENT_MODULE_PARM(force_ ## name, \
@@ -60,7 +36,7 @@
"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 @@
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 */
--
Jean Delvare
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |