diff --git a/drivers/iommu/arm-smmu-trace.h b/drivers/iommu/arm-smmu-trace.h
index 44cb073898db..174324b8bb5e 100644
--- a/drivers/iommu/arm-smmu-trace.h
+++ b/drivers/iommu/arm-smmu-trace.h
@@ -75,7 +75,7 @@ TRACE_EVENT(smmu_init,
 #endif /* _TRACE_ARM_SMMU_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/iommu
 
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE arm-smmu-trace
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 59cdb0406c00..7327311bf9de 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -4374,7 +4374,7 @@ static int arm_smmu_init_interconnect(struct arm_smmu_power_resources *pwr)
 	pwr->icc_path = of_icc_get(dev, NULL);
 	if (IS_ERR_OR_NULL(pwr->icc_path)) {
 		if (PTR_ERR(pwr->icc_path) != -EPROBE_DEFER)
-			dev_err(dev, "Unable to read interconnect path from devicetree rc: %d\n",
+			dev_err(dev, "Unable to read interconnect path from devicetree rc: %ld\n",
 				PTR_ERR(pwr->icc_path));
 		return pwr->icc_path ? PTR_ERR(pwr->icc_path) : -EINVAL;
 	}