From patchwork Thu Aug 10 12:11:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 109803 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2293340obb; Thu, 10 Aug 2017 05:26:26 -0700 (PDT) X-Received: by 10.84.215.134 with SMTP id l6mr13401303pli.190.1502367986665; Thu, 10 Aug 2017 05:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502367986; cv=none; d=google.com; s=arc-20160816; b=x3S1H9ucfqeVSuy+Y/E9reOejiCP4JkFfoReq7b5/LeF+boOL1x1ulmbH6etagYQOK phpTQM+HqBkfmMyMi5Ethozc+qFLfVmiHSp1ZPw5ZZdnx/gIOlieaY4aH3UB6BBTWb3P 7F5NKSI5r2mXeYoGPofpUiLeJh+aHm6qGgrMLj7+q6gdgcdITTwA0zGFpTBvW23DZnbt JK2TIM0D6c+a8RLt8/4+JsrQiMhnxdirS3Z+uJkyyAv2H9722GAbQ1pjy5D086CFbBCy E8c0XW8cIjXCJ8Qyp8sz/0D3qt21MbrgmXeMV0Xbf2QGm5NK6Ahyh7QtGoIp1/ONEEH+ kCOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Rl226iu43RikhsGzvZICXwEDSNTcMGmt/t03gs8kUaM=; b=otTiddBFziu/I//jdZY8zoPysfp4BiBIu6DuMvq9vr+uaYqwVYp5LGwux9O6lJqKeL zoD8c63wTPy20Vb88O1C8fdKvPM+WXN3IB3tNl3fm93RFmNDmavMbBHIBI9w2uXVYBr9 tZLpzTIkUIS1thDR1uuCSW4zYfKhIf0JUKs6bti2TbYZYIbmz7Rh0h/V8g5HBi0eL/b9 RLoywieON8HvwyAmChNPIa6VXS7E8haXQEfGvl43TZvGsFvMzc7GtUmdSkkxpcv5rbbs sjCLGji2LGPZS0d3PoyzNfkmQf8udLu9kvgWnKaktIjzQhgtPOh35AaN0jYREJRVgUwM +cig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c81si4061498pfb.606.2017.08.10.05.26.26; Thu, 10 Aug 2017 05:26:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752870AbdHJM0X (ORCPT + 25 others); Thu, 10 Aug 2017 08:26:23 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:49822 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752535AbdHJMLd (ORCPT ); Thu, 10 Aug 2017 08:11:33 -0400 Received: from wuerfel.lan ([95.208.155.18]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MIAsE-1dd19X1nQ6-003sDc; Thu, 10 Aug 2017 14:11:17 +0200 From: Arnd Bergmann To: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , "Rafael J. Wysocki" , Len Brown Cc: Arnd Bergmann , Will Deacon , Tomasz Nowicki , Joerg Roedel , Sricharan R , Robin Murphy , Geetha Sowjanya , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ACPI/IORT: fix build regression without IOMMU Date: Thu, 10 Aug 2017 14:11:00 +0200 Message-Id: <20170810121114.2509560-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:HxdTeIzm3M4p78CNDC20BymXigVS+KrPj975ArpxZAPt5Eb9j4g z05pauQDpI3N8+QreKj09li4GMvmVnqd+8q0ae3g8DbmYoeGLSpuA16BfZLBgkDZ6pgXZTe FweIf745EbY94H4RprKA1rgZQ88L7tfj6B08DENZlwu+EiDqwbcEcIzWaWfNjMVUGY4GSrz +Z70QuRdz3FheeZMw9Uug== X-UI-Out-Filterresults: notjunk:1; V01:K0:+p962uivAI0=:vJ4r9r21ZSfWE3+h9ueYG9 lAKYsxTUvthAkIhxP4Ul9uMv6hYKTst3vT6FnPsXD8x1isnXIhtemnNI/8q0EDqJ4lLGRITf8 GZ8T8qna7eEn2cHYmE53VhteA+lZA0EoAiND1oXjTLd135x/5rDXVyhXLtm6rcJpfA75VNK7C OaayG0EaSORZ+PNEM5LVa2w8pa8lImF4Tucxq7EqfdzqTNdk6u7hTEgn8wSGWEZjeUT8Qwkkq ua7dqMzLF7hqDthHaG/pXWmQdsFgRBAiizeRbdJYBlW/HW0Z3wMJrvw/3gJKZQdawYOZ44F/R wLBpJ4tqcD3ZFjCaXK1JS31NlIacLebrGSfAYjsXeCLvw1gAcOuYHNVuqFQ/UobbLeK/mcnNq 6a+LQIuNsyu7JxoVwlY5M6+ZKeMwxIE4pSdoBiO+ePGa6oyX5vESRaXi4uYIUxCEy27cJfPyV EJw5JkNfMuGLwIDZIo6xcgUfNfsmI/y56ikOZU1gIJssPB0q2JlgYvTXj/cyD/fgHEryWgkhY 1zKGijvGdXlIDwmkXU1zQTMXM3SyELRHB3j/hXBvorQmqL4Mz9Il+HqEfV6NRiaPxU8dOAgKF JDjpNtEqjSCCD5ft+eQQUHYWBgtCBRznxMeI+mk561OkdSaQd+Ib6pb+B4ov60OobpBnDffxj iXLn7WVxL+b5T8MF1iMDU86JxuWlJLABzPawqylOk4QIpCOmatyZzh9WFMAx6T6FPZsLcWM/t iZ2JUTO8qnvzXeaWh/eS+L22ce9Aso4lfqY5iQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent change reintroduced a bug that had previously been fixed by commit d49f2dedf33b ("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' This does the same change again, replacing another direct reference to iommu_fwspec->ops with a helper function call. Fixes: bc8648d49a95 ("ACPI/IORT: Handle PCI aliases properly for IOMMUs") Signed-off-by: Arnd Bergmann --- drivers/acpi/arm64/iort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 9cdd49289786..9565d572f8dd 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -826,7 +826,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); }