On Sat, 9 Mar 2013 19:16:45 +0100, Lars-Peter Clausen wrote: > Currently i2c_del_adapter() returns -EINVAL when it gets an adapter which is not > registered. But none of the users of i2c_del_adapter() depend on this behavior, At least two used to depend on it actually, and this is even why this code was added in the first place. See: http://lists.lm-sensors.org/pipermail/lm-sensors/2004-November/009350.html The check was added for the i2c-amd756-s4882 and i2c-nforce2-s4985 old-style SMBus multiplexing drivers. Meanwhile a safer check was added: commit 399d6b26539d83dd734746dc2292d53fbc5807b2 Author: Jean Delvare <khali@xxxxxxxxxxxx> Date: Sun Aug 10 22:56:15 2008 +0200 i2c: Fix oops on bus multiplexer driver loading The two I2C bus multiplexer drivers (i2c-amd756-s4882 and i2c-nforce2-s4985) make use of the bus they want to multiplex before checking if it is really present. Swap the instructions to test for presence first. This fixes a oops reported by Ingo Molnar. So these drivers indeed no longer depend on i2c_del_adapter() to detect whether their parent I2C adapter has been added or not. These two drivers should be removed and replaced with code using the standard I2C multiplexing infrastructure anyway, but it's not clear when anyone will find the time to actually do that. > so for the sake of being able to sanitize the return type of i2c_del_adapter > argue, that the purpose of i2c_del_adapter() is to remove an I2C adapter from > the system. If the adapter is not registered in the first place this becomes a > no-op. So we can return success without having to do anything. > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> > --- > drivers/i2c/i2c-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index a853cb3..7727d33 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -1072,7 +1072,7 @@ int i2c_del_adapter(struct i2c_adapter *adap) > if (found != adap) { > pr_debug("i2c-core: attempting to delete unregistered " > "adapter [%s]\n", adap->name); > - return -EINVAL; > + return 0; > } > > /* Tell drivers about this removal */ Reviewed-by: Jean Delvare <khali@xxxxxxxxxxxx> A more radical approach would be to say that you are simply not supposed to try and remove an adapter that was never added, so the whole check is pointless and should be removed. After all, i2c_unregister_device() and i2c_del_driver() do not have such a check. I don't know how cautious other subsystems are but I suspect most don't have such a check either. -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
