ACPI/IORT: Remove leftover ACPI_IORT_SMMU_V3_PXM_VALID guard
authorLorenzo Pieralisi <[email protected]>
Thu, 28 Sep 2017 12:57:10 +0000 (13:57 +0100)
committerLorenzo Pieralisi <[email protected]>
Mon, 16 Oct 2017 13:25:52 +0000 (14:25 +0100)
The conditional ACPI_IORT_SMMU_V3_PXM_VALID guard around
arm_smmu_v3_set_proximity() was added to manage a cross tree
ACPICA merge dependency; with ACPICA changes merged in:

commit c944230064eb ("ACPICA: iasl: Update to IORT SMMUv3
disassembling")

the guard has become useless. Remove it.

Signed-off-by: Lorenzo Pieralisi <[email protected]>
Acked-by: Hanjun Guo <[email protected]>
Cc: Hanjun Guo <[email protected]>
Cc: Sudeep Holla <[email protected]>
Cc: Ganapatrao Kulkarni <[email protected]>
drivers/acpi/arm64/iort.c

index 9565d572f8dd2f3d65c0e16b8257f61100bbad50..89c42aa7185899dbf6ee5038d0b008d1b31a47be 100644 (file)
@@ -968,7 +968,7 @@ static bool __init arm_smmu_v3_is_coherent(struct acpi_iort_node *node)
        return smmu->flags & ACPI_IORT_SMMU_V3_COHACC_OVERRIDE;
 }
 
-#if defined(CONFIG_ACPI_NUMA) && defined(ACPI_IORT_SMMU_V3_PXM_VALID)
+#if defined(CONFIG_ACPI_NUMA)
 /*
  * set numa proximity domain for smmuv3 device
  */