[PATCH] i2c: ID redefinition cleanups