Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d36037a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Catalin Marinas
Browse files

ACPI/IORT: Fix build regression without IOMMU 



A recent change reintroduced a bug that had previously been
fixed by commit d49f2ded ("ACPI/IORT: Fix CONFIG_IOMMU_API
dependency"):

drivers/acpi/arm64/iort.c: In function 'iort_iommu_configure':
drivers/acpi/arm64/iort.c:829:26: error: 'struct iommu_fwspec' has no member named 'ops'

Replace a direct reference to iommu_fwspec->ops with a helper function
call to fix the issue.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent caf5ef7d

drivers/acpi/arm64/iort.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) 
	 * add_device callback for dev, replay it to get things in order.

	 */

	if (!err) {

		ops = dev->iommu_fwspec->ops;

		ops = iort_fwspec_iommu_ops(dev->iommu_fwspec);

		err = iort_add_device_replay(ops, dev);

	}