msm7x30-common: more cleanup

Change-Id: I17aaf8bc015070bc9b6b9e73ccaf34387eb14c70