aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
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
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')
-rw-r--r--drivers/i2c/chips/ds1337.c2
-rw-r--r--drivers/i2c/chips/eeprom.c4
-rw-r--r--drivers/i2c/chips/max6875.c4
-rw-r--r--drivers/i2c/chips/pca9539.c4
-rw-r--r--drivers/i2c/chips/pcf8574.c4
-rw-r--r--drivers/i2c/chips/pcf8591.c4
6 files changed, 11 insertions, 11 deletions
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 8ab4e2348cda..c612f19fc7e6 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -226,7 +226,7 @@ int ds1337_do_command(int bus, int cmd, void *arg)
226 226
227static int ds1337_attach_adapter(struct i2c_adapter *adapter) 227static int ds1337_attach_adapter(struct i2c_adapter *adapter)
228{ 228{
229 return i2c_detect(adapter, &addr_data, ds1337_detect); 229 return i2c_probe(adapter, &addr_data, ds1337_detect);
230} 230}
231 231
232/* 232/*
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index 9466ada68932..befac01ecda6 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -152,10 +152,10 @@ static struct bin_attribute eeprom_attr = {
152 152
153static int eeprom_attach_adapter(struct i2c_adapter *adapter) 153static int eeprom_attach_adapter(struct i2c_adapter *adapter)
154{ 154{
155 return i2c_detect(adapter, &addr_data, eeprom_detect); 155 return i2c_probe(adapter, &addr_data, eeprom_detect);
156} 156}
157 157
158/* This function is called by i2c_detect */ 158/* This function is called by i2c_probe */
159int eeprom_detect(struct i2c_adapter *adapter, int address, int kind) 159int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
160{ 160{
161 struct i2c_client *new_client; 161 struct i2c_client *new_client;
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;
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 1500b1842ce5..c8ea2a1e1a45 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -108,10 +108,10 @@ static struct attribute_group pca9539_defattr_group = {
108 108
109static int pca9539_attach_adapter(struct i2c_adapter *adapter) 109static int pca9539_attach_adapter(struct i2c_adapter *adapter)
110{ 110{
111 return i2c_detect(adapter, &addr_data, pca9539_detect); 111 return i2c_probe(adapter, &addr_data, pca9539_detect);
112} 112}
113 113
114/* This function is called by i2c_detect */ 114/* This function is called by i2c_probe */
115static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind) 115static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
116{ 116{
117 struct i2c_client *new_client; 117 struct i2c_client *new_client;
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index a109dfd3dbe7..01ec9ce19768 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -112,10 +112,10 @@ static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
112 112
113static int pcf8574_attach_adapter(struct i2c_adapter *adapter) 113static int pcf8574_attach_adapter(struct i2c_adapter *adapter)
114{ 114{
115 return i2c_detect(adapter, &addr_data, pcf8574_detect); 115 return i2c_probe(adapter, &addr_data, pcf8574_detect);
116} 116}
117 117
118/* This function is called by i2c_detect */ 118/* This function is called by i2c_probe */
119int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind) 119int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind)
120{ 120{
121 struct i2c_client *new_client; 121 struct i2c_client *new_client;
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,
163 */ 163 */
164static int pcf8591_attach_adapter(struct i2c_adapter *adapter) 164static int pcf8591_attach_adapter(struct i2c_adapter *adapter)
165{ 165{
166 return i2c_detect(adapter, &addr_data, pcf8591_detect); 166 return i2c_probe(adapter, &addr_data, pcf8591_detect);
167} 167}
168 168
169/* This function is called by i2c_detect */ 169/* This function is called by i2c_probe */
170int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind) 170int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
171{ 171{
172 struct i2c_client *new_client; 172 struct i2c_client *new_client;