Merge "ASoC: msm: Fix issues to improve code quality"