Merge "input: cyttsp-i2c: Fix a few coding issues" into msm-3.0