From a3422b845251c5b208a6853b75c4cd6dea3f2ec7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Nov 2004 00:33:52 -0800 Subject: I2C: remove probe_range from I2C sensor drivers, as it's not used. Signed-off-by: Greg Kroah-Hartman --- include/linux/i2c-sensor.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'include/linux') diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h index 6db8f915147e..9b1c31180c69 100644 --- a/include/linux/i2c-sensor.h +++ b/include/linux/i2c-sensor.h @@ -58,12 +58,6 @@ struct i2c_force_data { 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 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. 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 @@ -84,7 +78,6 @@ struct i2c_address_data { unsigned int *normal_isa; unsigned int *normal_isa_range; unsigned short *probe; - unsigned short *probe_range; unsigned short *ignore; unsigned short *ignore_range; struct i2c_force_data *forces; @@ -100,9 +93,6 @@ struct i2c_address_data { #define SENSORS_INSMOD \ I2C_CLIENT_MODULE_PARM(probe, \ "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, \ "List of adapter,address pairs not to scan"); \ I2C_CLIENT_MODULE_PARM(ignore_range, \ @@ -114,7 +104,6 @@ struct i2c_address_data { .normal_isa = normal_isa, \ .normal_isa_range = normal_isa_range, \ .probe = probe, \ - .probe_range = probe_range, \ .ignore = ignore, \ .ignore_range = ignore_range, \ .forces = forces, \ -- cgit v1.2.3 From dced69a05850a773af702c9721db0c669f4dfabf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Nov 2004 00:34:36 -0800 Subject: I2C: remove ignore_range from I2C sensor drivers, as it's not used. Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/chips/pc87360.c | 2 -- drivers/i2c/chips/smsc47m1.c | 2 -- drivers/i2c/i2c-sensor-detect.c | 10 ---------- include/linux/i2c-sensor.h | 11 ----------- 4 files changed, 25 deletions(-) (limited to 'include/linux') 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, \ } -- cgit v1.2.3 From 331dc808872cf15377c3254d14dc7761b706829b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Nov 2004 00:35:21 -0800 Subject: I2C: remove normal_isa_range from I2C sensor drivers, as it's not used. Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/chips/adm1021.c | 1 - drivers/i2c/chips/adm1025.c | 1 - drivers/i2c/chips/adm1031.c | 1 - drivers/i2c/chips/asb100.c | 1 - drivers/i2c/chips/ds1621.c | 1 - drivers/i2c/chips/eeprom.c | 1 - drivers/i2c/chips/fscher.c | 1 - drivers/i2c/chips/gl518sm.c | 1 - drivers/i2c/chips/it87.c | 1 - drivers/i2c/chips/lm63.c | 1 - drivers/i2c/chips/lm75.c | 1 - drivers/i2c/chips/lm77.c | 1 - drivers/i2c/chips/lm78.c | 1 - drivers/i2c/chips/lm80.c | 1 - drivers/i2c/chips/lm83.c | 1 - drivers/i2c/chips/lm85.c | 1 - drivers/i2c/chips/lm87.c | 1 - drivers/i2c/chips/lm90.c | 1 - drivers/i2c/chips/max1619.c | 1 - drivers/i2c/chips/pc87360.c | 2 -- drivers/i2c/chips/pcf8574.c | 1 - drivers/i2c/chips/pcf8591.c | 1 - drivers/i2c/chips/smsc47m1.c | 2 -- drivers/i2c/chips/via686a.c | 1 - drivers/i2c/chips/w83627hf.c | 1 - drivers/i2c/chips/w83781d.c | 1 - drivers/i2c/chips/w83l785ts.c | 1 - drivers/i2c/i2c-sensor-detect.c | 8 -------- include/linux/i2c-sensor.h | 8 -------- 29 files changed, 45 deletions(-) (limited to 'include/linux') diff --git a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c index 9af7dac57c15..37514901ab4b 100644 --- a/drivers/i2c/chips/adm1021.c +++ b/drivers/i2c/chips/adm1021.c @@ -45,7 +45,6 @@ static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, 0x4c, 0x4e, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066); diff --git a/drivers/i2c/chips/adm1025.c b/drivers/i2c/chips/adm1025.c index 74b5d71c6aac..04bba15f0f22 100644 --- a/drivers/i2c/chips/adm1025.c +++ b/drivers/i2c/chips/adm1025.c @@ -62,7 +62,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/adm1031.c b/drivers/i2c/chips/adm1031.c index 23fb4f0f9957..4333cd2d729b 100644 --- a/drivers/i2c/chips/adm1031.c +++ b/drivers/i2c/chips/adm1031.c @@ -60,7 +60,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_2(adm1030, adm1031); diff --git a/drivers/i2c/chips/asb100.c b/drivers/i2c/chips/asb100.c index 3c3b731f0e41..184e6fdced65 100644 --- a/drivers/i2c/chips/asb100.c +++ b/drivers/i2c/chips/asb100.c @@ -61,7 +61,6 @@ static unsigned short normal_i2c_range[] = { 0x28, 0x2f, I2C_CLIENT_END }; /* ISA addresses to scan (none) */ static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(asb100); diff --git a/drivers/i2c/chips/ds1621.c b/drivers/i2c/chips/ds1621.c index 65ae6375a440..04408f0f6a1b 100644 --- a/drivers/i2c/chips/ds1621.c +++ b/drivers/i2c/chips/ds1621.c @@ -32,7 +32,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(ds1621); diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c index bad02cbdbb88..63aa0042e60c 100644 --- a/drivers/i2c/chips/eeprom.c +++ b/drivers/i2c/chips/eeprom.c @@ -39,7 +39,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x50, 0x57, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(eeprom); diff --git a/drivers/i2c/chips/fscher.c b/drivers/i2c/chips/fscher.c index ae70357c5313..ae1bbb29eaa2 100644 --- a/drivers/i2c/chips/fscher.c +++ b/drivers/i2c/chips/fscher.c @@ -40,7 +40,6 @@ static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c index 3e2c424badc2..baa732953b72 100644 --- a/drivers/i2c/chips/gl518sm.c +++ b/drivers/i2c/chips/gl518sm.c @@ -47,7 +47,6 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_2(gl518sm_r00, gl518sm_r80); diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c index d99cc281e98b..4fcae725f120 100644 --- a/drivers/i2c/chips/it87.c +++ b/drivers/i2c/chips/it87.c @@ -45,7 +45,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_2(it87, it8712); diff --git a/drivers/i2c/chips/lm63.c b/drivers/i2c/chips/lm63.c index 008f3d57d872..2a92d721ae51 100644 --- a/drivers/i2c/chips/lm63.c +++ b/drivers/i2c/chips/lm63.c @@ -52,7 +52,6 @@ static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c index 2afced370e36..f7848185a4c8 100644 --- a/drivers/i2c/chips/lm75.c +++ b/drivers/i2c/chips/lm75.c @@ -31,7 +31,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(lm75); diff --git a/drivers/i2c/chips/lm77.c b/drivers/i2c/chips/lm77.c index 802a6848079f..47c4c18b71f5 100644 --- a/drivers/i2c/chips/lm77.c +++ b/drivers/i2c/chips/lm77.c @@ -37,7 +37,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x48, 0x4b, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(lm77); diff --git a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c index e8ac16a8e91b..ddfc37dbd6bb 100644 --- a/drivers/i2c/chips/lm78.c +++ b/drivers/i2c/chips/lm78.c @@ -30,7 +30,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_3(lm78, lm78j, lm79); diff --git a/drivers/i2c/chips/lm80.c b/drivers/i2c/chips/lm80.c index 21a176d98438..61bc737e47ec 100644 --- a/drivers/i2c/chips/lm80.c +++ b/drivers/i2c/chips/lm80.c @@ -32,7 +32,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x28, 0x2f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(lm80); diff --git a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c index e0be8912f6bb..e243cfe77276 100644 --- a/drivers/i2c/chips/lm83.c +++ b/drivers/i2c/chips/lm83.c @@ -44,7 +44,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, 0x4c, 0x4e, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c index a1a84fcc834c..3d43b44af961 100644 --- a/drivers/i2c/chips/lm85.c +++ b/drivers/i2c/chips/lm85.c @@ -35,7 +35,6 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_4(lm85b, lm85c, adm1027, adt7463); diff --git a/drivers/i2c/chips/lm87.c b/drivers/i2c/chips/lm87.c index d7de3675ee9e..a5ba9947df36 100644 --- a/drivers/i2c/chips/lm87.c +++ b/drivers/i2c/chips/lm87.c @@ -68,7 +68,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c index 67a437bc642a..304d5434a9bb 100644 --- a/drivers/i2c/chips/lm90.c +++ b/drivers/i2c/chips/lm90.c @@ -78,7 +78,6 @@ static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/max1619.c b/drivers/i2c/chips/max1619.c index 9fab11499289..64cb72d0f4e0 100644 --- a/drivers/i2c/chips/max1619.c +++ b/drivers/i2c/chips/max1619.c @@ -38,7 +38,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, 0x4c, 0x4e, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/chips/pc87360.c b/drivers/i2c/chips/pc87360.c index c148f138c8d6..e87c65e3e5a9 100644 --- a/drivers/i2c/chips/pc87360.c +++ b/drivers/i2c/chips/pc87360.c @@ -45,7 +45,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; static struct i2c_force_data forces[] = {{ NULL }}; static u8 devid; static unsigned int extra_isa[3]; @@ -56,7 +55,6 @@ static struct i2c_address_data addr_data = { .normal_i2c = normal_i2c, .normal_i2c_range = normal_i2c_range, .normal_isa = normal_isa, - .normal_isa_range = normal_isa_range, .forces = forces, }; diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c index 52e56e77f561..101b6e5d966a 100644 --- a/drivers/i2c/chips/pcf8574.c +++ b/drivers/i2c/chips/pcf8574.c @@ -45,7 +45,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x20, 0x27, 0x38, 0x3f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_2(pcf8574, pcf8574a); diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c index a46c70d6ab3e..64dbbb12992c 100644 --- a/drivers/i2c/chips/pcf8591.c +++ b/drivers/i2c/chips/pcf8591.c @@ -30,7 +30,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(pcf8591); diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c index 21f948baa073..67f55521db37 100644 --- a/drivers/i2c/chips/smsc47m1.c +++ b/drivers/i2c/chips/smsc47m1.c @@ -37,7 +37,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; /* Address is autodetected, there is no default value */ static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; static struct i2c_force_data forces[] = {{NULL}}; enum chips { any_chip, smsc47m1 }; @@ -45,7 +44,6 @@ static struct i2c_address_data addr_data = { .normal_i2c = normal_i2c, .normal_i2c_range = normal_i2c_range, .normal_isa = normal_isa, - .normal_isa_range = normal_isa_range, .forces = forces, }; diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c index 8e391116998f..aeb32a0c9a30 100644 --- a/drivers/i2c/chips/via686a.c +++ b/drivers/i2c/chips/via686a.c @@ -54,7 +54,6 @@ MODULE_PARM_DESC(force_addr, static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(via686a); diff --git a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c index 4bb7aa958240..b297399075d7 100644 --- a/drivers/i2c/chips/w83627hf.c +++ b/drivers/i2c/chips/w83627hf.c @@ -59,7 +59,6 @@ MODULE_PARM_DESC(force_i2c, static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_4(w83627hf, w83627thf, w83697hf, w83637hf); diff --git a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c index 98aa8de32dad..f73bdac34497 100644 --- a/drivers/i2c/chips/w83781d.c +++ b/drivers/i2c/chips/w83781d.c @@ -52,7 +52,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697hf); diff --git a/drivers/i2c/chips/w83l785ts.c b/drivers/i2c/chips/w83l785ts.c index 58575861fc78..8dac10ac543d 100644 --- a/drivers/i2c/chips/w83l785ts.c +++ b/drivers/i2c/chips/w83l785ts.c @@ -49,7 +49,6 @@ static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* * Insmod parameters diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c index de77422354c3..a45240629995 100644 --- a/drivers/i2c/i2c-sensor-detect.c +++ b/drivers/i2c/i2c-sensor-detect.c @@ -93,14 +93,6 @@ int i2c_detect(struct i2c_adapter *adapter, found = 1; } } - for (i = 0; !found && (address_data->normal_isa_range[i] != I2C_CLIENT_ISA_END); i += 3) { - if ((addr >= address_data->normal_isa_range[i]) && - (addr <= address_data->normal_isa_range[i + 1]) && - ((addr - address_data->normal_isa_range[i]) % address_data->normal_isa_range[i + 2] == 0)) { - dev_dbg(&adapter->dev, "found normal isa_range entry for adapter %d, addr %04x", adapter_id, addr); - found = 1; - } - } } else { for (i = 0; !found && (address_data->normal_i2c[i] != I2C_CLIENT_END); i += 1) { if (addr == address_data->normal_i2c[i]) { diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h index fb38d276c3dd..7d05bef016d8 100644 --- a/include/linux/i2c-sensor.h +++ b/include/linux/i2c-sensor.h @@ -48,12 +48,6 @@ struct i2c_force_data { addresses which should normally be examined. normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END. A list of ISA addresses which should normally be examined. - normal_isa_range: filled in by the module writer. Terminated by - SENSORS_ISA_END - A list of triples. The first two elements are ISA addresses, being an - range of addresses which should normally be examined. The third is the - modulo parameter: only addresses which are 0 module this value relative - to the first address of the range are actually considered. probe: 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 the ISA bus, -1 for any I2C bus), the second is the address. These @@ -70,7 +64,6 @@ struct i2c_address_data { unsigned short *normal_i2c; unsigned short *normal_i2c_range; unsigned int *normal_isa; - unsigned int *normal_isa_range; unsigned short *probe; unsigned short *ignore; struct i2c_force_data *forces; @@ -92,7 +85,6 @@ struct i2c_address_data { .normal_i2c = normal_i2c, \ .normal_i2c_range = normal_i2c_range, \ .normal_isa = normal_isa, \ - .normal_isa_range = normal_isa_range, \ .probe = probe, \ .ignore = ignore, \ .forces = forces, \ -- cgit v1.2.3 From 0474cdc5f17fbb6e37cd02c64a19550798ac065b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Nov 2004 00:38:32 -0800 Subject: I2C: delete normal_i2c_range logic from sensors as there are no more users. --- drivers/i2c/i2c-sensor-detect.c | 12 +----------- include/linux/i2c-sensor.h | 6 ------ 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'include/linux') diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c index c82070ffa60d..d6f1f6a32d60 100644 --- a/drivers/i2c/i2c-sensor-detect.c +++ b/drivers/i2c/i2c-sensor-detect.c @@ -45,7 +45,6 @@ int i2c_detect(struct i2c_adapter *adapter, int adapter_id = is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter); unsigned short *normal_i2c; - unsigned short *normal_i2c_range; unsigned int *normal_isa; unsigned short *probe; unsigned short *ignore; @@ -56,12 +55,10 @@ int i2c_detect(struct i2c_adapter *adapter, return -1; /* Use default "empty" list if the adapter doesn't specify any */ - normal_i2c = normal_i2c_range = probe = ignore = empty; + normal_i2c = probe = ignore = empty; normal_isa = empty_isa; if (address_data->normal_i2c) normal_i2c = address_data->normal_i2c; - if (address_data->normal_i2c_range) - normal_i2c_range = address_data->normal_i2c_range; if (address_data->normal_isa) normal_isa = address_data->normal_isa; if (address_data->probe) @@ -121,13 +118,6 @@ int i2c_detect(struct i2c_adapter *adapter, dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x", adapter_id, addr); } } - for (i = 0; !found && (normal_i2c_range[i] != I2C_CLIENT_END); i += 2) { - if ((addr >= normal_i2c_range[i]) && - (addr <= normal_i2c_range[i + 1])) { - dev_dbg(&adapter->dev, "found normal i2c_range entry for adapter %d, addr %04x\n", adapter_id, addr); - found = 1; - } - } } for (i = 0; diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h index 7d05bef016d8..21b625204956 100644 --- a/include/linux/i2c-sensor.h +++ b/include/linux/i2c-sensor.h @@ -42,10 +42,6 @@ struct i2c_force_data { /* A structure containing the detect information. normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_ISA_END. A list of I2C addresses which should normally be examined. - normal_i2c_range: filled in by the module writer. Terminated by - I2C_CLIENT_ISA_END - A list of pairs of I2C addresses, each pair being an inclusive range of - addresses which should normally be examined. normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END. A list of ISA addresses which should normally be examined. probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. @@ -62,7 +58,6 @@ struct i2c_force_data { */ struct i2c_address_data { unsigned short *normal_i2c; - unsigned short *normal_i2c_range; unsigned int *normal_isa; unsigned short *probe; unsigned short *ignore; @@ -83,7 +78,6 @@ struct i2c_address_data { "List of adapter,address pairs not to scan"); \ static struct i2c_address_data addr_data = { \ .normal_i2c = normal_i2c, \ - .normal_i2c_range = normal_i2c_range, \ .normal_isa = normal_isa, \ .probe = probe, \ .ignore = ignore, \ -- cgit v1.2.3