i2c: re-org code to remove more ifdefs