mach-msm:cpufreq_limit: fix merge and minor code clean up