Merge "iommu: msm: Code cleanup"