summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/chips/pcf8591.c
diff options
context:
space:
mode:
authorJean Delvare2005-07-31 21:42:02 +0200
committerGreg Kroah-Hartman2005-09-05 18:14:20 +0200
commit2ed2dc3c116d26fc6a9384e83d136b15cc203b6c (patch)
treec79308b2cfe55eaddc95c47cbcafa6e0cae27413 /drivers/i2c/chips/pcf8591.c
parent[PATCH] hwmon: hwmon vs i2c, second round (03/11) (diff)
downloadkernel-qcow2-linux-2ed2dc3c116d26fc6a9384e83d136b15cc203b6c.tar.gz
kernel-qcow2-linux-2ed2dc3c116d26fc6a9384e83d136b15cc203b6c.tar.xz
kernel-qcow2-linux-2ed2dc3c116d26fc6a9384e83d136b15cc203b6c.zip
[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/pcf8591.c')
-rw-r--r--drivers/i2c/chips/pcf8591.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index 7fce0fc048d9..dd03f2c725c8 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -163,10 +163,10 @@ static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
*/
static int pcf8591_attach_adapter(struct i2c_adapter *adapter)
{
- return i2c_detect(adapter, &addr_data, pcf8591_detect);
+ return i2c_probe(adapter, &addr_data, pcf8591_detect);
}
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *new_client;