aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/adm1021.c2
-rw-r--r--drivers/hwmon/adm1025.c2
-rw-r--r--drivers/hwmon/adm1026.c2
-rw-r--r--drivers/hwmon/adm1031.c4
-rw-r--r--drivers/hwmon/adm9240.c2
-rw-r--r--drivers/hwmon/asb100.c2
-rw-r--r--drivers/hwmon/atxp1.c2
-rw-r--r--drivers/hwmon/ds1621.c4
-rw-r--r--drivers/hwmon/fscher.c2
-rw-r--r--drivers/hwmon/fscpos.c2
-rw-r--r--drivers/hwmon/gl518sm.c2
-rw-r--r--drivers/hwmon/gl520sm.c2
-rw-r--r--drivers/hwmon/it87.c4
-rw-r--r--drivers/hwmon/lm63.c2
-rw-r--r--drivers/hwmon/lm75.c4
-rw-r--r--drivers/hwmon/lm77.c4
-rw-r--r--drivers/hwmon/lm78.c4
-rw-r--r--drivers/hwmon/lm80.c2
-rw-r--r--drivers/hwmon/lm83.c2
-rw-r--r--drivers/hwmon/lm85.c2
-rw-r--r--drivers/hwmon/lm87.c2
-rw-r--r--drivers/hwmon/lm90.c2
-rw-r--r--drivers/hwmon/lm92.c2
-rw-r--r--drivers/hwmon/max1619.c2
-rw-r--r--drivers/hwmon/w83781d.c2
-rw-r--r--drivers/hwmon/w83792d.c2
-rw-r--r--drivers/hwmon/w83l785ts.c2
-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
33 files changed, 44 insertions, 44 deletions
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index da3e2c9f705f..21f6dfeb04ac 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -187,7 +187,7 @@ static int adm1021_attach_adapter(struct i2c_adapter *adapter)
187{ 187{
188 if (!(adapter->class & I2C_CLASS_HWMON)) 188 if (!(adapter->class & I2C_CLASS_HWMON))
189 return 0; 189 return 0;
190 return i2c_detect(adapter, &addr_data, adm1021_detect); 190 return i2c_probe(adapter, &addr_data, adm1021_detect);
191} 191}
192 192
193static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) 193static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 181dadf42002..5b21284df2f8 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -314,7 +314,7 @@ static int adm1025_attach_adapter(struct i2c_adapter *adapter)
314{ 314{
315 if (!(adapter->class & I2C_CLASS_HWMON)) 315 if (!(adapter->class & I2C_CLASS_HWMON))
316 return 0; 316 return 0;
317 return i2c_detect(adapter, &addr_data, adm1025_detect); 317 return i2c_probe(adapter, &addr_data, adm1025_detect);
318} 318}
319 319
320/* 320/*
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 8e8b0ef8fff3..f3a78f792919 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -321,7 +321,7 @@ int adm1026_attach_adapter(struct i2c_adapter *adapter)
321 if (!(adapter->class & I2C_CLASS_HWMON)) { 321 if (!(adapter->class & I2C_CLASS_HWMON)) {
322 return 0; 322 return 0;
323 } 323 }
324 return i2c_detect(adapter, &addr_data, adm1026_detect); 324 return i2c_probe(adapter, &addr_data, adm1026_detect);
325} 325}
326 326
327int adm1026_detach_client(struct i2c_client *client) 327int adm1026_detach_client(struct i2c_client *client)
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index a60187e24830..9221653590a8 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -727,10 +727,10 @@ static int adm1031_attach_adapter(struct i2c_adapter *adapter)
727{ 727{
728 if (!(adapter->class & I2C_CLASS_HWMON)) 728 if (!(adapter->class & I2C_CLASS_HWMON))
729 return 0; 729 return 0;
730 return i2c_detect(adapter, &addr_data, adm1031_detect); 730 return i2c_probe(adapter, &addr_data, adm1031_detect);
731} 731}
732 732
733/* This function is called by i2c_detect */ 733/* This function is called by i2c_probe */
734static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind) 734static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
735{ 735{
736 struct i2c_client *new_client; 736 struct i2c_client *new_client;
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 82edf286ebdc..6b20b28aa3b9 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -635,7 +635,7 @@ static int adm9240_attach_adapter(struct i2c_adapter *adapter)
635{ 635{
636 if (!(adapter->class & I2C_CLASS_HWMON)) 636 if (!(adapter->class & I2C_CLASS_HWMON))
637 return 0; 637 return 0;
638 return i2c_detect(adapter, &addr_data, adm9240_detect); 638 return i2c_probe(adapter, &addr_data, adm9240_detect);
639} 639}
640 640
641static int adm9240_detach_client(struct i2c_client *client) 641static int adm9240_detach_client(struct i2c_client *client)
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index c6a2c94fad36..a6c6c9d3fddd 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -621,7 +621,7 @@ static int asb100_attach_adapter(struct i2c_adapter *adapter)
621{ 621{
622 if (!(adapter->class & I2C_CLASS_HWMON)) 622 if (!(adapter->class & I2C_CLASS_HWMON))
623 return 0; 623 return 0;
624 return i2c_detect(adapter, &addr_data, asb100_detect); 624 return i2c_probe(adapter, &addr_data, asb100_detect);
625} 625}
626 626
627static int asb100_detect_subclients(struct i2c_adapter *adapter, int address, 627static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index ced54189a579..329ddafd524b 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -254,7 +254,7 @@ static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
254 254
255static int atxp1_attach_adapter(struct i2c_adapter *adapter) 255static int atxp1_attach_adapter(struct i2c_adapter *adapter)
256{ 256{
257 return i2c_detect(adapter, &addr_data, &atxp1_detect); 257 return i2c_probe(adapter, &addr_data, &atxp1_detect);
258}; 258};
259 259
260static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind) 260static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 3ac37e95d2ef..a3b3a5887621 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -181,10 +181,10 @@ static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, set_temp_max);
181 181
182static int ds1621_attach_adapter(struct i2c_adapter *adapter) 182static int ds1621_attach_adapter(struct i2c_adapter *adapter)
183{ 183{
184 return i2c_detect(adapter, &addr_data, ds1621_detect); 184 return i2c_probe(adapter, &addr_data, ds1621_detect);
185} 185}
186 186
187/* This function is called by i2c_detect */ 187/* This function is called by i2c_probe */
188int ds1621_detect(struct i2c_adapter *adapter, int address, 188int ds1621_detect(struct i2c_adapter *adapter, int address,
189 int kind) 189 int kind)
190{ 190{
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index ddf22fbf4ed1..5629e68a5ca3 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -289,7 +289,7 @@ static int fscher_attach_adapter(struct i2c_adapter *adapter)
289{ 289{
290 if (!(adapter->class & I2C_CLASS_HWMON)) 290 if (!(adapter->class & I2C_CLASS_HWMON))
291 return 0; 291 return 0;
292 return i2c_detect(adapter, &addr_data, fscher_detect); 292 return i2c_probe(adapter, &addr_data, fscher_detect);
293} 293}
294 294
295static int fscher_detect(struct i2c_adapter *adapter, int address, int kind) 295static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 489870ad6056..edc84f2f6454 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -436,7 +436,7 @@ static int fscpos_attach_adapter(struct i2c_adapter *adapter)
436{ 436{
437 if (!(adapter->class & I2C_CLASS_HWMON)) 437 if (!(adapter->class & I2C_CLASS_HWMON))
438 return 0; 438 return 0;
439 return i2c_detect(adapter, &addr_data, fscpos_detect); 439 return i2c_probe(adapter, &addr_data, fscpos_detect);
440} 440}
441 441
442int fscpos_detect(struct i2c_adapter *adapter, int address, int kind) 442int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 63a2756c283a..15376a6e0494 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -348,7 +348,7 @@ static int gl518_attach_adapter(struct i2c_adapter *adapter)
348{ 348{
349 if (!(adapter->class & I2C_CLASS_HWMON)) 349 if (!(adapter->class & I2C_CLASS_HWMON))
350 return 0; 350 return 0;
351 return i2c_detect(adapter, &addr_data, gl518_detect); 351 return i2c_probe(adapter, &addr_data, gl518_detect);
352} 352}
353 353
354static int gl518_detect(struct i2c_adapter *adapter, int address, int kind) 354static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index ff71eb7ac681..18539c9559c6 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -520,7 +520,7 @@ static int gl520_attach_adapter(struct i2c_adapter *adapter)
520{ 520{
521 if (!(adapter->class & I2C_CLASS_HWMON)) 521 if (!(adapter->class & I2C_CLASS_HWMON))
522 return 0; 522 return 0;
523 return i2c_detect(adapter, &addr_data, gl520_detect); 523 return i2c_probe(adapter, &addr_data, gl520_detect);
524} 524}
525 525
526static int gl520_detect(struct i2c_adapter *adapter, int address, int kind) 526static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
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
704static int it87_isa_attach_adapter(struct i2c_adapter *adapter) 704static 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 */
742int it87_detect(struct i2c_adapter *adapter, int address, int kind) 742int it87_detect(struct i2c_adapter *adapter, int address, int kind)
743{ 743{
744 int i; 744 int i;
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 736126d73aa2..dd2702131aed 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -360,7 +360,7 @@ static int lm63_attach_adapter(struct i2c_adapter *adapter)
360{ 360{
361 if (!(adapter->class & I2C_CLASS_HWMON)) 361 if (!(adapter->class & I2C_CLASS_HWMON))
362 return 0; 362 return 0;
363 return i2c_detect(adapter, &addr_data, lm63_detect); 363 return i2c_probe(adapter, &addr_data, lm63_detect);
364} 364}
365 365
366/* 366/*
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index a2bebb6b37a6..bd39452db895 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -109,10 +109,10 @@ static int lm75_attach_adapter(struct i2c_adapter *adapter)
109{ 109{
110 if (!(adapter->class & I2C_CLASS_HWMON)) 110 if (!(adapter->class & I2C_CLASS_HWMON))
111 return 0; 111 return 0;
112 return i2c_detect(adapter, &addr_data, lm75_detect); 112 return i2c_probe(adapter, &addr_data, lm75_detect);
113} 113}
114 114
115/* This function is called by i2c_detect */ 115/* This function is called by i2c_probe */
116static int lm75_detect(struct i2c_adapter *adapter, int address, int kind) 116static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
117{ 117{
118 int i; 118 int i;
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index d47aab3b3c05..52218570f874 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -209,10 +209,10 @@ static int lm77_attach_adapter(struct i2c_adapter *adapter)
209{ 209{
210 if (!(adapter->class & I2C_CLASS_HWMON)) 210 if (!(adapter->class & I2C_CLASS_HWMON))
211 return 0; 211 return 0;
212 return i2c_detect(adapter, &addr_data, lm77_detect); 212 return i2c_probe(adapter, &addr_data, lm77_detect);
213} 213}
214 214
215/* This function is called by i2c_detect */ 215/* This function is called by i2c_probe */
216static int lm77_detect(struct i2c_adapter *adapter, int address, int kind) 216static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
217{ 217{
218 struct i2c_client *new_client; 218 struct i2c_client *new_client;
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
484static int lm78_isa_attach_adapter(struct i2c_adapter *adapter) 484static 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 */
490int lm78_detect(struct i2c_adapter *adapter, int address, int kind) 490int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
491{ 491{
492 int i, err; 492 int i, err;
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 36a0cda36a7d..500c38f3feae 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -391,7 +391,7 @@ static int lm80_attach_adapter(struct i2c_adapter *adapter)
391{ 391{
392 if (!(adapter->class & I2C_CLASS_HWMON)) 392 if (!(adapter->class & I2C_CLASS_HWMON))
393 return 0; 393 return 0;
394 return i2c_detect(adapter, &addr_data, lm80_detect); 394 return i2c_probe(adapter, &addr_data, lm80_detect);
395} 395}
396 396
397int lm80_detect(struct i2c_adapter *adapter, int address, int kind) 397int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index f3557f8826a9..5b78d19693e8 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -214,7 +214,7 @@ static int lm83_attach_adapter(struct i2c_adapter *adapter)
214{ 214{
215 if (!(adapter->class & I2C_CLASS_HWMON)) 215 if (!(adapter->class & I2C_CLASS_HWMON))
216 return 0; 216 return 0;
217 return i2c_detect(adapter, &addr_data, lm83_detect); 217 return i2c_probe(adapter, &addr_data, lm83_detect);
218} 218}
219 219
220/* 220/*
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 248920134fd9..8976565113f4 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -1012,7 +1012,7 @@ int lm85_attach_adapter(struct i2c_adapter *adapter)
1012{ 1012{
1013 if (!(adapter->class & I2C_CLASS_HWMON)) 1013 if (!(adapter->class & I2C_CLASS_HWMON))
1014 return 0; 1014 return 0;
1015 return i2c_detect(adapter, &addr_data, lm85_detect); 1015 return i2c_probe(adapter, &addr_data, lm85_detect);
1016} 1016}
1017 1017
1018int lm85_detect(struct i2c_adapter *adapter, int address, 1018int lm85_detect(struct i2c_adapter *adapter, int address,
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index f0ffe58e3670..af161203ce1d 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -539,7 +539,7 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
539{ 539{
540 if (!(adapter->class & I2C_CLASS_HWMON)) 540 if (!(adapter->class & I2C_CLASS_HWMON))
541 return 0; 541 return 0;
542 return i2c_detect(adapter, &addr_data, lm87_detect); 542 return i2c_probe(adapter, &addr_data, lm87_detect);
543} 543}
544 544
545/* 545/*
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index fbf9dac41ee5..68155c72a4e4 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -354,7 +354,7 @@ static int lm90_attach_adapter(struct i2c_adapter *adapter)
354{ 354{
355 if (!(adapter->class & I2C_CLASS_HWMON)) 355 if (!(adapter->class & I2C_CLASS_HWMON))
356 return 0; 356 return 0;
357 return i2c_detect(adapter, &addr_data, lm90_detect); 357 return i2c_probe(adapter, &addr_data, lm90_detect);
358} 358}
359 359
360/* 360/*
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 9740ee264051..7ddc9116d091 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -389,7 +389,7 @@ static int lm92_attach_adapter(struct i2c_adapter *adapter)
389{ 389{
390 if (!(adapter->class & I2C_CLASS_HWMON)) 390 if (!(adapter->class & I2C_CLASS_HWMON))
391 return 0; 391 return 0;
392 return i2c_detect(adapter, &addr_data, lm92_detect); 392 return i2c_probe(adapter, &addr_data, lm92_detect);
393} 393}
394 394
395static int lm92_detach_client(struct i2c_client *client) 395static int lm92_detach_client(struct i2c_client *client)
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index a53d7df92ba2..056506bae5f2 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -180,7 +180,7 @@ static int max1619_attach_adapter(struct i2c_adapter *adapter)
180{ 180{
181 if (!(adapter->class & I2C_CLASS_HWMON)) 181 if (!(adapter->class & I2C_CLASS_HWMON))
182 return 0; 182 return 0;
183 return i2c_detect(adapter, &addr_data, max1619_detect); 183 return i2c_probe(adapter, &addr_data, max1619_detect);
184} 184}
185 185
186/* 186/*
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 66835c1e3f68..f269faeffa47 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -869,7 +869,7 @@ w83781d_attach_adapter(struct i2c_adapter *adapter)
869{ 869{
870 if (!(adapter->class & I2C_CLASS_HWMON)) 870 if (!(adapter->class & I2C_CLASS_HWMON))
871 return 0; 871 return 0;
872 return i2c_detect(adapter, &addr_data, w83781d_detect); 872 return i2c_probe(adapter, &addr_data, w83781d_detect);
873} 873}
874 874
875static int 875static int
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index ea0c3519e03a..49e3ccd84bd0 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -1076,7 +1076,7 @@ w83792d_attach_adapter(struct i2c_adapter *adapter)
1076{ 1076{
1077 if (!(adapter->class & I2C_CLASS_HWMON)) 1077 if (!(adapter->class & I2C_CLASS_HWMON))
1078 return 0; 1078 return 0;
1079 return i2c_detect(adapter, &addr_data, w83792d_detect); 1079 return i2c_probe(adapter, &addr_data, w83792d_detect);
1080} 1080}
1081 1081
1082 1082
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 213fb170d397..129d4012e8fd 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -142,7 +142,7 @@ static int w83l785ts_attach_adapter(struct i2c_adapter *adapter)
142{ 142{
143 if (!(adapter->class & I2C_CLASS_HWMON)) 143 if (!(adapter->class & I2C_CLASS_HWMON))
144 return 0; 144 return 0;
145 return i2c_detect(adapter, &addr_data, w83l785ts_detect); 145 return i2c_probe(adapter, &addr_data, w83l785ts_detect);
146} 146}
147 147
148/* 148/*
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;