Commit 0474cdc5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

I2C: delete normal_i2c_range logic from sensors as there are no more users.

parent b61e056b
...@@ -45,7 +45,6 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -45,7 +45,6 @@ int i2c_detect(struct i2c_adapter *adapter,
int adapter_id = int adapter_id =
is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter); is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);
unsigned short *normal_i2c; unsigned short *normal_i2c;
unsigned short *normal_i2c_range;
unsigned int *normal_isa; unsigned int *normal_isa;
unsigned short *probe; unsigned short *probe;
unsigned short *ignore; unsigned short *ignore;
...@@ -56,12 +55,10 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -56,12 +55,10 @@ int i2c_detect(struct i2c_adapter *adapter,
return -1; return -1;
/* Use default "empty" list if the adapter doesn't specify any */ /* 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; normal_isa = empty_isa;
if (address_data->normal_i2c) if (address_data->normal_i2c)
normal_i2c = 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) if (address_data->normal_isa)
normal_isa = address_data->normal_isa; normal_isa = address_data->normal_isa;
if (address_data->probe) if (address_data->probe)
...@@ -121,13 +118,6 @@ int i2c_detect(struct i2c_adapter *adapter, ...@@ -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); 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; for (i = 0;
......
...@@ -42,10 +42,6 @@ struct i2c_force_data { ...@@ -42,10 +42,6 @@ struct i2c_force_data {
/* A structure containing the detect information. /* A structure containing the detect information.
normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_ISA_END. normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_ISA_END.
A list of I2C addresses which should normally be examined. 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. normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END.
A list of ISA addresses which should normally be examined. A list of ISA addresses which should normally be examined.
probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values.
...@@ -62,7 +58,6 @@ struct i2c_force_data { ...@@ -62,7 +58,6 @@ struct i2c_force_data {
*/ */
struct i2c_address_data { struct i2c_address_data {
unsigned short *normal_i2c; unsigned short *normal_i2c;
unsigned short *normal_i2c_range;
unsigned int *normal_isa; unsigned int *normal_isa;
unsigned short *probe; unsigned short *probe;
unsigned short *ignore; unsigned short *ignore;
...@@ -83,7 +78,6 @@ struct i2c_address_data { ...@@ -83,7 +78,6 @@ struct i2c_address_data {
"List of adapter,address pairs not to scan"); \ "List of adapter,address pairs 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_isa = normal_isa, \ .normal_isa = normal_isa, \
.probe = probe, \ .probe = probe, \
.ignore = ignore, \ .ignore = ignore, \
......
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