Merge "input: touchscreen: Code clean-up for Goodix driver"