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

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

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent a3422b84
...@@ -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,
.ignore = normal_i2c, /* 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,
.ignore = normal_i2c, /* cheat */
.ignore_range = normal_i2c_range, /* cheat */
.forces = forces, .forces = forces,
}; };
......
...@@ -81,16 +81,6 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -81,16 +81,6 @@ int i2c_detect(struct i2c_adapter *adapter,
found = 1; found = 1;
} }
} }
for (i = 0; !found && (address_data->ignore_range[i] != I2C_CLIENT_END); i += 3) {
if ( ((adapter_id == address_data->ignore_range[i]) ||
((address_data-> ignore_range[i] == ANY_I2C_BUS) &
!is_isa)) &&
(addr >= address_data->ignore_range[i + 1]) &&
(addr <= address_data->ignore_range[i + 2])) {
dev_dbg(&adapter->dev, "found ignore_range parameter for adapter %d, addr %04x\n", adapter_id, addr);
found = 1;
}
}
if (found) if (found)
continue; continue;
......
...@@ -63,12 +63,6 @@ struct i2c_force_data { ...@@ -63,12 +63,6 @@ struct i2c_force_data {
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
addresses are never probed. This parameter overrules 'normal' and addresses are never probed. This parameter overrules 'normal' and
'probe', but not the 'force' lists. 'probe', but not the 'force' lists.
ignore_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 I2C addresses that are never probed.
This parameter overrules 'normal' and 'probe', but not the 'force' lists.
force_data: insmod parameters. A list, ending with an element of which force_data: insmod parameters. A list, ending with an element of which
the force field is NULL. the force field is NULL.
*/ */
...@@ -79,7 +73,6 @@ struct i2c_address_data { ...@@ -79,7 +73,6 @@ struct i2c_address_data {
unsigned int *normal_isa_range; unsigned int *normal_isa_range;
unsigned short *probe; unsigned short *probe;
unsigned short *ignore; unsigned short *ignore;
unsigned short *ignore_range;
struct i2c_force_data *forces; struct i2c_force_data *forces;
}; };
...@@ -95,9 +88,6 @@ struct i2c_address_data { ...@@ -95,9 +88,6 @@ struct i2c_address_data {
"List of adapter,address pairs to scan additionally"); \ "List of adapter,address pairs 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, \
"List of adapter,start-addr,end-addr triples not to " \
"scan"); \
static struct i2c_address_data addr_data = { \ static struct i2c_address_data addr_data = { \
.normal_i2c = normal_i2c, \ .normal_i2c = normal_i2c, \
.normal_i2c_range = normal_i2c_range, \ .normal_i2c_range = normal_i2c_range, \
...@@ -105,7 +95,6 @@ struct i2c_address_data { ...@@ -105,7 +95,6 @@ struct i2c_address_data {
.normal_isa_range = normal_isa_range, \ .normal_isa_range = normal_isa_range, \
.probe = probe, \ .probe = probe, \
.ignore = ignore, \ .ignore = ignore, \
.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