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