qcom-common: code cleanup

Change-Id: I655c5718622a51ecae7af697c8acd1cf70050ee1