From patchwork Wed Jan 13 13:21:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 8025011 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A5E92BEEED for ; Wed, 13 Jan 2016 13:24:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6E4F20498 for ; Wed, 13 Jan 2016 13:24:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7ED1204A0 for ; Wed, 13 Jan 2016 13:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754562AbcAMNYU (ORCPT ); Wed, 13 Jan 2016 08:24:20 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38741 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760253AbcAMNVu (ORCPT ); Wed, 13 Jan 2016 08:21:50 -0500 Received: by mail-wm0-f41.google.com with SMTP id b14so371538576wmb.1 for ; Wed, 13 Jan 2016 05:21:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hW6+EyEc9uzZKaddsC+m6dgtj0RF6kKbDGYUiUcZoRE=; b=u0Y+p3KTZKiQXlolqdhIc8HVFEj7j3J4v8th3SaRFORv8vNLhCWT8HT6eFE0GUTf0X AinRnVtORE4HKTARynxePY56L5qH5abVS7hUSR0mcAXarNX1/eZhMefEceh3RsGL36j0 PF+mriPBmVIVXyMECT3OV3go2Mn2jn0taGEx86PHw5N/cprQo6VrjzBOkAMMtoVZpBLu MzFtKW3X65KG70PCSXnmGRmsLNBQTCwol1igqyFILMY/UkccwiHhA+98CwXdJUfp01WE s08WH+VJhedrYB096OGMwglcuDEiWCrTudiCSdlPtURnWus7MgQwEP1HBgG7bS1V7RHk vsZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hW6+EyEc9uzZKaddsC+m6dgtj0RF6kKbDGYUiUcZoRE=; b=FtSCRsiFRVJaO3P3LhH53PeW/CIt8ZbYFJQYpERUD+b1S/6VIrlQnf0B/L/F0vwTl4 4HS+w72xn48AB0M+1FSIyyFGgdtHnRW/JH3OVBdh4PDvcQCi7ecjl46534ZE9iEx8kC7 A82+c13PJl+V5DFuBLQIGOXjfK0i2w56U6aEBb2UwxRyhen9LepkrMOMV5oATHWcKIM/ NGK5PLhdjlq3ILqlmid+w8clrJFSV5uj8MEhpV/IXDajX/2Ozk0ZzX4btfzBe8lGR5Xx nc7xfcCZnz+xXMVf7WpoTVnyU/kU8r1K8dnOz2xpM30nAPquo7VP0erGFTDhs+h6fqOo JATg== X-Gm-Message-State: ALoCoQnfsDTyMuOynjuKb67AA6yZwUl7h7QwPuEW5/FWW20oVZDpTVyACV9qzlq+gJ2mCvvrqswKvpAbSAlmEO0nqYmHeCGF7w== X-Received: by 10.194.24.164 with SMTP id v4mr19631161wjf.138.1452691309150; Wed, 13 Jan 2016 05:21:49 -0800 (PST) Received: from tn-HP-4.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id y124sm8858741wmg.3.2016.01.13.05.21.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jan 2016 05:21:48 -0800 (PST) From: Tomasz Nowicki To: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, tglx@linutronix.de, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jchandra@broadcom.com, jcm@redhat.com, Tomasz Nowicki Subject: [PATCH V3 16/21] x86, acpi, pci: Use equivalent function introduced in previous patch. Date: Wed, 13 Jan 2016 14:21:02 +0100 Message-Id: <1452691267-32240-17-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452691267-32240-1-git-send-email-tn@semihalf.com> References: <1452691267-32240-1-git-send-email-tn@semihalf.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Tomasz Nowicki --- arch/x86/pci/acpi.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 286e0f5..c4d79d2 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -201,29 +201,11 @@ static int setup_mcfg_map(struct acpi_pci_root_info *ci) return 0; } - -static void teardown_mcfg_map(struct acpi_pci_root_info *ci) -{ - struct acpi_pci_root *root = ci->root; - struct pci_mmcfg_region *cfg; - - cfg = pci_mmconfig_lookup(root->segment, root->secondary.start); - if (!cfg) - return; - - if (cfg->hot_added) - pci_mmconfig_delete(root->segment, root->secondary.start, - root->secondary.end); -} #else static int setup_mcfg_map(struct acpi_pci_root_info *ci) { return 0; } - -static void teardown_mcfg_map(struct acpi_pci_root_info *ci) -{ -} #endif static int pci_acpi_root_get_node(struct acpi_pci_root *root) @@ -251,7 +233,7 @@ static int pci_acpi_root_init_info(struct acpi_pci_root_info *ci) static void pci_acpi_root_release_info(struct acpi_pci_root_info *ci) { - teardown_mcfg_map(ci); + pci_mmcfg_teardown_map(ci); kfree(container_of(ci, struct pci_root_info, common)); }