fix merge derp in smartmaxcpufreq_smartmax.c and some cosmetics

Change-Id: I0c73e2a2dbd2d90bcb32c6054bd8114682e174c1