Arnd reports a build warning[1] thanks to me missing ipmmu-vmsa's second set of ops when converting io-pgtable-arm users to the new iommu_iotlb_* callbacks. Rather than just treat the symptom with a point fix, this seemed like a good excuse to clean up the messy #ifdeffery and duplication in the driver that led to the oversight in the first place. Build-tested successfully for arm64, ARM, and ARM + CONFIG_IOMMU_DMA. Robin. [1]:https://www.mail-archive.com/linux-kernel@xxxxxxxxxxxxxxx/msg1510423.html Robin Murphy (4): iommu/ipmmu-vmsa: Unify domain alloc/free iommu/ipmmu-vmsa: Simplify group allocation iommu/ipmmu-vmsa: Clean up struct ipmmu_vmsa_iommu_priv iommu/ipmmu-vmsa: Unify ipmmu_ops drivers/iommu/ipmmu-vmsa.c | 251 ++++++++++++++------------------------------- 1 file changed, 78 insertions(+), 173 deletions(-) -- 2.13.4.dirty