Skip to content

L
linux
Commit ef8dec5d authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] hwmon: hwmon vs i2c, second round (02/11) 

The way i2c-sensor handles forced addresses could be optimized. It
defines a structure (i2c_force_data) to associate a module parameter
with a given kind value, but in fact this kind value is always the
index of the structure in each array it is used in. So this additional
value can be omitted, and still be deduced in the code handling these
arrays.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9fc6adfa
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 79 deletions
drivers/i2c/i2c-sensor-detect.c
View file @ ef8dec5d
...@@ -32,7 +32,6 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -32,7 +32,6 @@ int i2c_detect(struct i2c_adapter *adapter,
int (*found_proc) (struct i2c_adapter *, int, int)) int (*found_proc) (struct i2c_adapter *, int, int))
{ {
int addr, i, found, j, err; int addr, i, found, j, err;
struct i2c_force_data *this_force;
int adapter_id = i2c_adapter_id(adapter); int adapter_id = i2c_adapter_id(adapter);
unsigned short *normal_i2c; unsigned short *normal_i2c;
unsigned short *probe; unsigned short *probe;
...@@ -58,13 +57,13 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -58,13 +57,13 @@ int i2c_detect(struct i2c_adapter *adapter,
/* If it is in one of the force entries, we don't do any /* If it is in one of the force entries, we don't do any
detection at all */ detection at all */
found = 0; found = 0;
for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) { for (i = 0; address_data->forces[i]; i++) {
for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) { for (j = 0; !found && (address_data->forces[i][j] != I2C_CLIENT_END); j += 2) {
if ( ((adapter_id == this_force->force[j]) || if ( ((adapter_id == address_data->forces[i][j]) ||
(this_force->force[j] == ANY_I2C_BUS)) && (address_data->forces[i][j] == ANY_I2C_BUS)) &&
(addr == this_force->force[j + 1]) ) { (addr == address_data->forces[i][j + 1]) ) {
dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr); dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr);
if ((err = found_proc(adapter, addr, this_force->kind))) if ((err = found_proc(adapter, addr, i)))
return err; return err;
found = 1; found = 1;
} }
......
include/linux/i2c-sensor.h
View file @ ef8dec5d
...@@ -22,22 +22,6 @@ ...@@ -22,22 +22,6 @@
#ifndef _LINUX_I2C_SENSOR_H #ifndef _LINUX_I2C_SENSOR_H
#define _LINUX_I2C_SENSOR_H #define _LINUX_I2C_SENSOR_H
/* A structure containing detect information.
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.
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.
kind: The kind of chip. 0 equals any chip.
*/
struct i2c_force_data {
unsigned short *force;
unsigned short kind;
};
/* A structure containing the detect information. /* A structure containing the detect information.
normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_END. normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_END.
A list of I2C addresses which should normally be examined. A list of I2C addresses which should normally be examined.
...@@ -50,14 +34,18 @@ struct i2c_force_data { ...@@ -50,14 +34,18 @@ struct i2c_force_data {
I2C bus), the second is the I2C address. These addresses are never I2C bus), the second is the I2C address. These addresses are never
probed. This parameter overrules 'normal' and probe', but not the probed. This parameter overrules 'normal' and probe', but not the
'force' lists. 'force' lists.
force_data: insmod parameters. A list, ending with an element of which forces: insmod parameters. A list, ending with a NULL element.
the force field is NULL. 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 { struct i2c_address_data {
unsigned short *normal_i2c; unsigned short *normal_i2c;
unsigned short *probe; unsigned short *probe;
unsigned short *ignore; unsigned short *ignore;
struct i2c_force_data *forces; unsigned short **forces;
}; };
#define SENSORS_MODULE_PARM_FORCE(name) \ #define SENSORS_MODULE_PARM_FORCE(name) \
...@@ -88,7 +76,8 @@ struct i2c_address_data { ...@@ -88,7 +76,8 @@ struct i2c_address_data {
I2C_CLIENT_MODULE_PARM(force, \ I2C_CLIENT_MODULE_PARM(force, \
"List of adapter,address pairs to boldly assume " \ "List of adapter,address pairs to boldly assume " \
"to be present"); \ "to be present"); \
static struct i2c_force_data forces[] = {{force,any_chip},{NULL}}; \ static unsigned short *forces[] = { force, \
NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_1(chip1) \ #define SENSORS_INSMOD_1(chip1) \
...@@ -97,9 +86,9 @@ struct i2c_address_data { ...@@ -97,9 +86,9 @@ struct i2c_address_data {
"List of adapter,address pairs to boldly assume " \ "List of adapter,address pairs to boldly assume " \
"to be present"); \ "to be present"); \
SENSORS_MODULE_PARM_FORCE(chip1); \ SENSORS_MODULE_PARM_FORCE(chip1); \
static struct i2c_force_data forces[] = {{force,any_chip},\ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_2(chip1,chip2) \ #define SENSORS_INSMOD_2(chip1,chip2) \
...@@ -109,10 +98,10 @@ struct i2c_address_data { ...@@ -109,10 +98,10 @@ struct i2c_address_data {
"to be present"); \ "to be present"); \
SENSORS_MODULE_PARM_FORCE(chip1); \ SENSORS_MODULE_PARM_FORCE(chip1); \
SENSORS_MODULE_PARM_FORCE(chip2); \ SENSORS_MODULE_PARM_FORCE(chip2); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_3(chip1,chip2,chip3) \ #define SENSORS_INSMOD_3(chip1,chip2,chip3) \
...@@ -123,11 +112,11 @@ struct i2c_address_data { ...@@ -123,11 +112,11 @@ struct i2c_address_data {
SENSORS_MODULE_PARM_FORCE(chip1); \ SENSORS_MODULE_PARM_FORCE(chip1); \
SENSORS_MODULE_PARM_FORCE(chip2); \ SENSORS_MODULE_PARM_FORCE(chip2); \
SENSORS_MODULE_PARM_FORCE(chip3); \ SENSORS_MODULE_PARM_FORCE(chip3); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{force_ ## chip3,chip3}, \ force_##chip3, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_4(chip1,chip2,chip3,chip4) \ #define SENSORS_INSMOD_4(chip1,chip2,chip3,chip4) \
...@@ -139,12 +128,12 @@ struct i2c_address_data { ...@@ -139,12 +128,12 @@ struct i2c_address_data {
SENSORS_MODULE_PARM_FORCE(chip2); \ SENSORS_MODULE_PARM_FORCE(chip2); \
SENSORS_MODULE_PARM_FORCE(chip3); \ SENSORS_MODULE_PARM_FORCE(chip3); \
SENSORS_MODULE_PARM_FORCE(chip4); \ SENSORS_MODULE_PARM_FORCE(chip4); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{force_ ## chip3,chip3}, \ force_##chip3, \
{force_ ## chip4,chip4}, \ force_##chip4, \
{NULL}}; \ NULL}; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_5(chip1,chip2,chip3,chip4,chip5) \ #define SENSORS_INSMOD_5(chip1,chip2,chip3,chip4,chip5) \
...@@ -157,13 +146,13 @@ struct i2c_address_data { ...@@ -157,13 +146,13 @@ struct i2c_address_data {
SENSORS_MODULE_PARM_FORCE(chip3); \ SENSORS_MODULE_PARM_FORCE(chip3); \
SENSORS_MODULE_PARM_FORCE(chip4); \ SENSORS_MODULE_PARM_FORCE(chip4); \
SENSORS_MODULE_PARM_FORCE(chip5); \ SENSORS_MODULE_PARM_FORCE(chip5); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{force_ ## chip3,chip3}, \ force_##chip3, \
{force_ ## chip4,chip4}, \ force_##chip4, \
{force_ ## chip5,chip5}, \ force_##chip5, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_6(chip1,chip2,chip3,chip4,chip5,chip6) \ #define SENSORS_INSMOD_6(chip1,chip2,chip3,chip4,chip5,chip6) \
...@@ -177,14 +166,14 @@ struct i2c_address_data { ...@@ -177,14 +166,14 @@ struct i2c_address_data {
SENSORS_MODULE_PARM_FORCE(chip4); \ SENSORS_MODULE_PARM_FORCE(chip4); \
SENSORS_MODULE_PARM_FORCE(chip5); \ SENSORS_MODULE_PARM_FORCE(chip5); \
SENSORS_MODULE_PARM_FORCE(chip6); \ SENSORS_MODULE_PARM_FORCE(chip6); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{force_ ## chip3,chip3}, \ force_##chip3, \
{force_ ## chip4,chip4}, \ force_##chip4, \
{force_ ## chip5,chip5}, \ force_##chip5, \
{force_ ## chip6,chip6}, \ force_##chip6, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_7(chip1,chip2,chip3,chip4,chip5,chip6,chip7) \ #define SENSORS_INSMOD_7(chip1,chip2,chip3,chip4,chip5,chip6,chip7) \
...@@ -199,15 +188,15 @@ struct i2c_address_data { ...@@ -199,15 +188,15 @@ struct i2c_address_data {
SENSORS_MODULE_PARM_FORCE(chip5); \ SENSORS_MODULE_PARM_FORCE(chip5); \
SENSORS_MODULE_PARM_FORCE(chip6); \ SENSORS_MODULE_PARM_FORCE(chip6); \
SENSORS_MODULE_PARM_FORCE(chip7); \ SENSORS_MODULE_PARM_FORCE(chip7); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{force_ ## chip3,chip3}, \ force_##chip3, \
{force_ ## chip4,chip4}, \ force_##chip4, \
{force_ ## chip5,chip5}, \ force_##chip5, \
{force_ ## chip6,chip6}, \ force_##chip6, \
{force_ ## chip7,chip7}, \ force_##chip7, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
#define SENSORS_INSMOD_8(chip1,chip2,chip3,chip4,chip5,chip6,chip7,chip8) \ #define SENSORS_INSMOD_8(chip1,chip2,chip3,chip4,chip5,chip6,chip7,chip8) \
...@@ -223,16 +212,16 @@ struct i2c_address_data { ...@@ -223,16 +212,16 @@ struct i2c_address_data {
SENSORS_MODULE_PARM_FORCE(chip6); \ SENSORS_MODULE_PARM_FORCE(chip6); \
SENSORS_MODULE_PARM_FORCE(chip7); \ SENSORS_MODULE_PARM_FORCE(chip7); \
SENSORS_MODULE_PARM_FORCE(chip8); \ SENSORS_MODULE_PARM_FORCE(chip8); \
static struct i2c_force_data forces[] = {{force,any_chip}, \ static unsigned short *forces[] = { force, \
{force_ ## chip1,chip1}, \ force_##chip1, \
{force_ ## chip2,chip2}, \ force_##chip2, \
{force_ ## chip3,chip3}, \ force_##chip3, \
{force_ ## chip4,chip4}, \ force_##chip4, \
{force_ ## chip5,chip5}, \ force_##chip5, \
{force_ ## chip6,chip6}, \ force_##chip6, \
{force_ ## chip7,chip7}, \ force_##chip7, \
{force_ ## chip8,chip8}, \ force_##chip8, \
{NULL}}; \ NULL }; \
SENSORS_INSMOD SENSORS_INSMOD
/* Detect function. It iterates over all possible addresses itself. For /* Detect function. It iterates over all possible addresses itself. For
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7