diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 15:42:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:20 -0400 |
commit | 2ed2dc3c116d26fc6a9384e83d136b15cc203b6c (patch) | |
tree | c79308b2cfe55eaddc95c47cbcafa6e0cae27413 /drivers/i2c/chips/eeprom.c | |
parent | b78ec31582c60578ee1d3bb470791d6dde96ccf7 (diff) |
[PATCH] hwmon: hwmon vs i2c, second round (04/11)
i2c_probe and i2c_detect now do the exact same thing and operate on
the same data structure, so we can have everyone call i2c_probe.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/chips/eeprom.c')
-rw-r--r-- | drivers/i2c/chips/eeprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c index 9466ada68932..befac01ecda6 100644 --- a/drivers/i2c/chips/eeprom.c +++ b/drivers/i2c/chips/eeprom.c | |||
@@ -152,10 +152,10 @@ static struct bin_attribute eeprom_attr = { | |||
152 | 152 | ||
153 | static int eeprom_attach_adapter(struct i2c_adapter *adapter) | 153 | static int eeprom_attach_adapter(struct i2c_adapter *adapter) |
154 | { | 154 | { |
155 | return i2c_detect(adapter, &addr_data, eeprom_detect); | 155 | return i2c_probe(adapter, &addr_data, eeprom_detect); |
156 | } | 156 | } |
157 | 157 | ||
158 | /* This function is called by i2c_detect */ | 158 | /* This function is called by i2c_probe */ |
159 | int eeprom_detect(struct i2c_adapter *adapter, int address, int kind) | 159 | int eeprom_detect(struct i2c_adapter *adapter, int address, int kind) |
160 | { | 160 | { |
161 | struct i2c_client *new_client; | 161 | struct i2c_client *new_client; |