Skip to contentSkip to conversation

I2C: Rewrite i2c_probe

PATCH New Greg KH 1 participant 1 message Sep 5, 2005 I2C

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 I2C: Rewrite i2c_probe

[PATCH] I2C: Rewrite i2c_probe

i2c_probe was quite complex and slow, so I rewrote it in a more efficient and hopefully clearer way.

Note that this slightly changes the way the module parameters are handled. This shouldn't change anything for the most common cases though.

For one thing, the function now respects the order of the parameters for address probing. It used to always do lower addresses first. The new approach gives the user more control.

For another, ignore addresses don't overrule probe addresses anymore. This could have been restored the way it was at the cost of a few more lines of code, but I don't think it's worth it. Both lists are given as module parameters, so a user would be quite silly to specify the same addresses in both lists. The normal addresses list is the only one that isn't controlled by a module parameter, thus is the only one the user may reasonably want to remove an address from.

Another significant change is the fact that i2c_probe() will no more stop when a detection function returns -ENODEV. Just because a driver found a chip it doesn't support isn't a valid reason to stop all probings for this one driver. This closes the long standing lm_sensors ticket #1807.

http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket07

I updated the documentation accordingly.

In terms of algorithmic complexity, the new code is way better. If I is the ignore address count, P the probe address count, N the normal address count and F the force address count, the old code was doing 128 * (F + I + P + N) iterations max, while the new code does F + P + ((I+1) * N) iterations max. For the most common case where F, I and P are empty, this is down from 128 * N to N.

---
commit a89ba0bc02e82920a0f4137aa5d655ac0366cc28
tree 98489ed77a287a81ff4ad7233fd543e59e58c328
parent 3b6c0634cc989f0735a1541ccf9288947685cab5
author Jean Delvare <[email protected]> Tue, 09 Aug 2005 20:17:55 +0200 committer Greg Kroah-Hartman <[email protected]> Mon, 05 Sep 2005 09:14:25 -0700

 Documentation/i2c/writing-clients |    7 +-
 drivers/i2c/i2c-core.c            |  167 ++++++++++++++++++++-----------------
 2 files changed, 94 insertions(+), 80 deletions(-)
Documentation/i2c/writing-clients +4 -3
@@ -241,9 +241,10 @@ Below, some things are only needed if th
 parts are between /* SENSORS ONLY START */ and /* SENSORS ONLY END */
 markers. 
 
-This function should only return an error (any value != 0) if there is
-some reason why no more detection should be done anymore. If the
-detection just fails for this address, return 0.
+Returning an error different from -ENODEV in a detect function will cause
+the detection to stop: other addresses and adapters won't be scanned.
+This should only be done on fatal or internal errors, such as a memory
+shortage or i2c_attach_client failing.
 
 For now, you can ignore the `flags' parameter. It is there for future use.
 
drivers/i2c/i2c-core.c +90 -77

197 lines not on this page · raw message