Commit a3422b84 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

I2C: remove probe_range from I2C sensor drivers, as it's not used.

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 4e894b78
...@@ -57,8 +57,6 @@ static struct i2c_address_data addr_data = { ...@@ -57,8 +57,6 @@ static struct i2c_address_data addr_data = {
.normal_i2c_range = normal_i2c_range, .normal_i2c_range = normal_i2c_range,
.normal_isa = normal_isa, .normal_isa = normal_isa,
.normal_isa_range = normal_isa_range, .normal_isa_range = normal_isa_range,
.probe = normal_i2c, /* cheat */
.probe_range = normal_i2c_range, /* cheat */
.ignore = normal_i2c, /* cheat */ .ignore = normal_i2c, /* cheat */
.ignore_range = normal_i2c_range, /* cheat */ .ignore_range = normal_i2c_range, /* cheat */
.forces = forces, .forces = forces,
......
...@@ -46,8 +46,6 @@ static struct i2c_address_data addr_data = { ...@@ -46,8 +46,6 @@ static struct i2c_address_data addr_data = {
.normal_i2c_range = normal_i2c_range, .normal_i2c_range = normal_i2c_range,
.normal_isa = normal_isa, .normal_isa = normal_isa,
.normal_isa_range = normal_isa_range, .normal_isa_range = normal_isa_range,
.probe = normal_i2c, /* cheat */
.probe_range = normal_i2c_range, /* cheat */
.ignore = normal_i2c, /* cheat */ .ignore = normal_i2c, /* cheat */
.ignore_range = normal_i2c_range, /* cheat */ .ignore_range = normal_i2c_range, /* cheat */
.forces = forces, .forces = forces,
......
...@@ -138,15 +138,6 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -138,15 +138,6 @@ int i2c_detect(struct i2c_adapter *adapter,
found = 1; found = 1;
} }
} }
for (i = 0; !found && (address_data->probe_range[i] != I2C_CLIENT_END); i += 3) {
if ( ((adapter_id == address_data->probe_range[i]) ||
((address_data->probe_range[i] == ANY_I2C_BUS) && !is_isa)) &&
(addr >= address_data->probe_range[i + 1]) &&
(addr <= address_data->probe_range[i + 2])) {
found = 1;
dev_dbg(&adapter->dev, "found probe_range parameter for adapter %d, addr %04x\n", adapter_id, addr);
}
}
if (!found) if (!found)
continue; continue;
......
...@@ -58,12 +58,6 @@ struct i2c_force_data { ...@@ -58,12 +58,6 @@ struct i2c_force_data {
A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for
the ISA bus, -1 for any I2C bus), the second is the address. These the ISA bus, -1 for any I2C bus), the second is the address. These
addresses are also probed, as if they were in the 'normal' list. addresses are also probed, as if they were in the 'normal' list.
probe_range: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END
values.
A list of triples. The first value is a bus number (ANY_I2C_ISA_BUS for
the ISA bus, -1 for any I2C bus), the second and third are addresses.
These form an inclusive range of addresses that are also probed, as
if they were in the 'normal' list.
ignore: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. ignore: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values.
A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for
the ISA bus, -1 for any I2C bus), the second is the I2C address. These the ISA bus, -1 for any I2C bus), the second is the I2C address. These
...@@ -84,7 +78,6 @@ struct i2c_address_data { ...@@ -84,7 +78,6 @@ struct i2c_address_data {
unsigned int *normal_isa; unsigned int *normal_isa;
unsigned int *normal_isa_range; unsigned int *normal_isa_range;
unsigned short *probe; unsigned short *probe;
unsigned short *probe_range;
unsigned short *ignore; unsigned short *ignore;
unsigned short *ignore_range; unsigned short *ignore_range;
struct i2c_force_data *forces; struct i2c_force_data *forces;
...@@ -100,9 +93,6 @@ struct i2c_address_data { ...@@ -100,9 +93,6 @@ struct i2c_address_data {
#define SENSORS_INSMOD \ #define SENSORS_INSMOD \
I2C_CLIENT_MODULE_PARM(probe, \ I2C_CLIENT_MODULE_PARM(probe, \
"List of adapter,address pairs to scan additionally"); \ "List of adapter,address pairs to scan additionally"); \
I2C_CLIENT_MODULE_PARM(probe_range, \
"List of adapter,start-addr,end-addr triples to scan " \
"additionally"); \
I2C_CLIENT_MODULE_PARM(ignore, \ I2C_CLIENT_MODULE_PARM(ignore, \
"List of adapter,address pairs not to scan"); \ "List of adapter,address pairs not to scan"); \
I2C_CLIENT_MODULE_PARM(ignore_range, \ I2C_CLIENT_MODULE_PARM(ignore_range, \
...@@ -114,7 +104,6 @@ struct i2c_address_data { ...@@ -114,7 +104,6 @@ struct i2c_address_data {
.normal_isa = normal_isa, \ .normal_isa = normal_isa, \
.normal_isa_range = normal_isa_range, \ .normal_isa_range = normal_isa_range, \
.probe = probe, \ .probe = probe, \
.probe_range = probe_range, \
.ignore = ignore, \ .ignore = ignore, \
.ignore_range = ignore_range, \ .ignore_range = ignore_range, \
.forces = forces, \ .forces = forces, \
......
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