From patchwork Fri Feb 9 12:15:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 10208907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C43F60236 for ; Fri, 9 Feb 2018 12:15:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A5AE29811 for ; Fri, 9 Feb 2018 12:15:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EF2D29812; Fri, 9 Feb 2018 12:15:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 76C7F29816 for ; Fri, 9 Feb 2018 12:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=V5nFnaLktXfgReGQCsqSVqq4KOytop8xDHL6cxEH6wI=; b=pQz h/L7arVzMRPq8z2DWbRA+7u2v4fE4oaR1uinJUTtzm7ggGbAYA3dSTh4FeKWKesho5kvaeriQYMKr s5jtnk1GZ/U4pef/qWD1nSYRjcdz4msH8U6OSH3RjsVeJF04T33qfG7HOlMrNCCcCCsOTHvAKn/NT FM7IT+rYefpS1U1fRn0HKId1FTxazaX/qd2+XpYHXlY41dUarRn4VrlV76jmCQnThmb6LZDOKFotS DYFOkmcVQ1O9SguEHWKeg+uOsni/nNfQlXWJ9EnM1aFO6bOJ7eu4biweD96qhgiZSZJ8pMu1vuFbt zkoB40BvCQL4SHTYjvVq8UlgW3i47Tg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ek7aW-0002FG-FD; Fri, 09 Feb 2018 12:15:32 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ek7aT-0002F5-9e for linux-arm-kernel@lists.infradead.org; Fri, 09 Feb 2018 12:15:30 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6179480D; Fri, 9 Feb 2018 04:15:18 -0800 (PST) Received: from e107981-ln.cambridge.arm.com (e107981-ln.cambridge.arm.com [10.1.207.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D65E83F25C; Fri, 9 Feb 2018 04:15:16 -0800 (PST) From: Lorenzo Pieralisi To: linux-acpi@vger.kernel.org Subject: [PATCH] ACPI/IORT: Remove temporary iort_get_id_mapping_index() ACPICA guard Date: Fri, 9 Feb 2018 12:15:10 +0000 Message-Id: <20180209121510.9015-1-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.15.0 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rafael J. Wysocki" , Lorenzo Pieralisi , Catalin Marinas , Will Deacon , Hanjun Guo , Sudeep Holla , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In IORT issue C SMMUv3 IORT nodes gained an additional field (DeviceID mapping index) so that the SMMUv3 can describe its MSI interrupts. Referring to it in the kernel requires ACPICA changes and in order to prevent kernel<->ACPICA dependencies kernel code depending on the SMMUv3 DeviceID mapping index field was guarded with an ACPICA version conditional. ACPICA changes introducing DeviceID mapping index in the IORT structs were integrated in the kernel with: commit 4c106aa411ee ("ACPICA: iasl: Add SMMUv3 device ID mapping index support") so the temporary ACPICA guard has become stale and can be removed. Signed-off-by: Lorenzo Pieralisi Cc: Will Deacon Cc: Hanjun Guo Cc: Sudeep Holla Cc: Catalin Marinas Cc: "Rafael J. Wysocki" Acked-by: Hanjun Guo --- drivers/acpi/arm64/iort.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 95255ecfae7c..a84a5787bbd2 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -366,7 +366,6 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node, return NULL; } -#if (ACPI_CA_VERSION > 0x20170929) static int iort_get_id_mapping_index(struct acpi_iort_node *node) { struct acpi_iort_smmu_v3 *smmu; @@ -400,12 +399,6 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node) return -EINVAL; } } -#else -static inline int iort_get_id_mapping_index(struct acpi_iort_node *node) -{ - return -EINVAL; -} -#endif static struct acpi_iort_node *iort_node_map_id(struct acpi_iort_node *node, u32 id_in, u32 *id_out,