diff options
| -rw-r--r-- | drivers/i2c/chips/pc87360.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/chips/smsc47m1.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-sensor-detect.c | 10 | ||||
| -rw-r--r-- | include/linux/i2c-sensor.h | 11 |
4 files changed, 0 insertions, 25 deletions
diff --git a/drivers/i2c/chips/pc87360.c b/drivers/i2c/chips/pc87360.c index d3f3676fc397..c148f138c8d6 100644 --- a/drivers/i2c/chips/pc87360.c +++ b/drivers/i2c/chips/pc87360.c @@ -57,8 +57,6 @@ static struct i2c_address_data addr_data = { .normal_i2c_range = normal_i2c_range, .normal_isa = normal_isa, .normal_isa_range = normal_isa_range, - .ignore = normal_i2c, /* cheat */ - .ignore_range = normal_i2c_range, /* cheat */ .forces = forces, }; diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c index 47fd7e48d18a..21f948baa073 100644 --- a/drivers/i2c/chips/smsc47m1.c +++ b/drivers/i2c/chips/smsc47m1.c @@ -46,8 +46,6 @@ static struct i2c_address_data addr_data = { .normal_i2c_range = normal_i2c_range, .normal_isa = normal_isa, .normal_isa_range = normal_isa_range, - .ignore = normal_i2c, /* cheat */ - .ignore_range = normal_i2c_range, /* cheat */ .forces = forces, }; diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c index 50be7a049ac3..de77422354c3 100644 --- a/drivers/i2c/i2c-sensor-detect.c +++ b/drivers/i2c/i2c-sensor-detect.c @@ -81,16 +81,6 @@ int i2c_detect(struct i2c_adapter *adapter, 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) continue; diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h index 9b1c31180c69..fb38d276c3dd 100644 --- a/include/linux/i2c-sensor.h +++ b/include/linux/i2c-sensor.h @@ -63,12 +63,6 @@ struct i2c_force_data { the ISA bus, -1 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. - 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 the force field is NULL. */ @@ -79,7 +73,6 @@ struct i2c_address_data { unsigned int *normal_isa_range; unsigned short *probe; unsigned short *ignore; - unsigned short *ignore_range; struct i2c_force_data *forces; }; @@ -95,9 +88,6 @@ 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"); \ - I2C_CLIENT_MODULE_PARM(ignore_range, \ - "List of adapter,start-addr,end-addr triples not to " \ - "scan"); \ static struct i2c_address_data addr_data = { \ .normal_i2c = normal_i2c, \ .normal_i2c_range = normal_i2c_range, \ @@ -105,7 +95,6 @@ struct i2c_address_data { .normal_isa_range = normal_isa_range, \ .probe = probe, \ .ignore = ignore, \ - .ignore_range = ignore_range, \ .forces = forces, \ } |