From: Mitchel Humpherys Date: Tue, 22 Sep 2015 19:10:39 +0000 (-0700) Subject: iommu/arm-smmu: Remove some duplicate macro definitions X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aa728b977c2182ef7e5663507a8fa7d5e9062875;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git iommu/arm-smmu: Remove some duplicate macro definitions When we brought back hardware ATOS support [94bc89042be5cb: "iommu/arm-smmu: Resurrect hardware iova-to-phys"] we added some macros back that were never deleted in the first place. Clean up the redundant macros. Change-Id: I0129313fa4132f45fe5805e9ed3477ef7819e70e Signed-off-by: Mitchel Humpherys --- diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 4f9a8c5e6b8b..41d29da529ef 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -293,13 +293,6 @@ #define FSYNR0_WNR (1 << 4) -#define ARM_SMMU_IMPL_DEF0(smmu) \ - ((smmu)->base + (2 * (1 << (smmu)->pgshift))) -#define ARM_SMMU_IMPL_DEF1(smmu) \ - ((smmu)->base + (6 * (1 << (smmu)->pgshift))) -#define IMPL_DEF1_MICRO_MMU_CTRL 0 -#define MICRO_MMU_CTRL_LOCAL_HALT_REQ (1 << 2) - static int force_stage; module_param_named(force_stage, force_stage, int, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(force_stage,