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/hwmon/lm78.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/hwmon/lm78.c')
-rw-r--r-- | drivers/hwmon/lm78.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 21b767a66bbd..008fd9310061 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -478,7 +478,7 @@ static int lm78_attach_adapter(struct i2c_adapter *adapter) | |||
478 | { | 478 | { |
479 | if (!(adapter->class & I2C_CLASS_HWMON)) | 479 | if (!(adapter->class & I2C_CLASS_HWMON)) |
480 | return 0; | 480 | return 0; |
481 | return i2c_detect(adapter, &addr_data, lm78_detect); | 481 | return i2c_probe(adapter, &addr_data, lm78_detect); |
482 | } | 482 | } |
483 | 483 | ||
484 | static int lm78_isa_attach_adapter(struct i2c_adapter *adapter) | 484 | static int lm78_isa_attach_adapter(struct i2c_adapter *adapter) |
@@ -486,7 +486,7 @@ static int lm78_isa_attach_adapter(struct i2c_adapter *adapter) | |||
486 | return lm78_detect(adapter, isa_address, -1); | 486 | return lm78_detect(adapter, isa_address, -1); |
487 | } | 487 | } |
488 | 488 | ||
489 | /* This function is called by i2c_detect */ | 489 | /* This function is called by i2c_probe */ |
490 | int lm78_detect(struct i2c_adapter *adapter, int address, int kind) | 490 | int lm78_detect(struct i2c_adapter *adapter, int address, int kind) |
491 | { | 491 | { |
492 | int i, err; | 492 | int i, err; |