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/it87.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/it87.c')
-rw-r--r-- | drivers/hwmon/it87.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index ca4f953363f4..d1e04c40e64c 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
@@ -698,7 +698,7 @@ static int it87_attach_adapter(struct i2c_adapter *adapter) | |||
698 | { | 698 | { |
699 | if (!(adapter->class & I2C_CLASS_HWMON)) | 699 | if (!(adapter->class & I2C_CLASS_HWMON)) |
700 | return 0; | 700 | return 0; |
701 | return i2c_detect(adapter, &addr_data, it87_detect); | 701 | return i2c_probe(adapter, &addr_data, it87_detect); |
702 | } | 702 | } |
703 | 703 | ||
704 | static int it87_isa_attach_adapter(struct i2c_adapter *adapter) | 704 | static int it87_isa_attach_adapter(struct i2c_adapter *adapter) |
@@ -738,7 +738,7 @@ exit: | |||
738 | return err; | 738 | return err; |
739 | } | 739 | } |
740 | 740 | ||
741 | /* This function is called by i2c_detect */ | 741 | /* This function is called by i2c_probe */ |
742 | int it87_detect(struct i2c_adapter *adapter, int address, int kind) | 742 | int it87_detect(struct i2c_adapter *adapter, int address, int kind) |
743 | { | 743 | { |
744 | int i; | 744 | int i; |