summaryrefslogtreecommitdiff
path: root/drivers/hwmon/adm1031.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-07-31 19:42:02 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 16:14:20 (GMT)
commit2ed2dc3c116d26fc6a9384e83d136b15cc203b6c (patch)
treec79308b2cfe55eaddc95c47cbcafa6e0cae27413 /drivers/hwmon/adm1031.c
parentb78ec31582c60578ee1d3bb470791d6dde96ccf7 (diff)
downloadlinux-2ed2dc3c116d26fc6a9384e83d136b15cc203b6c.tar.xz
[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/adm1031.c')
-rw-r--r--drivers/hwmon/adm1031.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index a60187e..9221653 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -727,10 +727,10 @@ static int adm1031_attach_adapter(struct i2c_adapter *adapter)
{
if (!(adapter->class & I2C_CLASS_HWMON))
return 0;
- return i2c_detect(adapter, &addr_data, adm1031_detect);
+ return i2c_probe(adapter, &addr_data, adm1031_detect);
}
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *new_client;