aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/chips/max6875.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-07-31 15:42:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 12:14:20 -0400
commit2ed2dc3c116d26fc6a9384e83d136b15cc203b6c (patch)
treec79308b2cfe55eaddc95c47cbcafa6e0cae27413 /drivers/i2c/chips/max6875.c
parentb78ec31582c60578ee1d3bb470791d6dde96ccf7 (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/max6875.c')
-rw-r--r--drivers/i2c/chips/max6875.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 52fd6bf29133..42663f921ecc 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -161,10 +161,10 @@ static struct bin_attribute user_eeprom_attr = {
161 161
162static int max6875_attach_adapter(struct i2c_adapter *adapter) 162static int max6875_attach_adapter(struct i2c_adapter *adapter)
163{ 163{
164 return i2c_detect(adapter, &addr_data, max6875_detect); 164 return i2c_probe(adapter, &addr_data, max6875_detect);
165} 165}
166 166
167/* This function is called by i2c_detect */ 167/* This function is called by i2c_probe */
168static int max6875_detect(struct i2c_adapter *adapter, int address, int kind) 168static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
169{ 169{
170 struct i2c_client *real_client; 170 struct i2c_client *real_client;