From patchwork Wed Dec 16 15:16:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7862511 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D1B39F1C2 for ; Wed, 16 Dec 2015 15:20:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BE44202FE for ; Wed, 16 Dec 2015 15:20:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82D6B2035E for ; Wed, 16 Dec 2015 15:20:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932613AbbLPPUo (ORCPT ); Wed, 16 Dec 2015 10:20:44 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:34484 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965840AbbLPPSM (ORCPT ); Wed, 16 Dec 2015 10:18:12 -0500 Received: by mail-wm0-f46.google.com with SMTP id l126so44183555wml.1 for ; Wed, 16 Dec 2015 07:18:12 -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=QY2hd3xaBYGzu2B/Z53xV/B2Qltf4TvFVkJzB5rw5LA=; b=aiRbFCvf1feTc3XzP7FHj9+zz//4f7vXcPjVwRqEoh8WXC0fL6FvkVOToMQbx0k6fO ztHp6ok+eTlCQ8U56rMoqMTtTQUnQTt6Ew2jAJn4QyLODn36U+WicD7R6mzLl+mUnsUT riX5NE63+DKIL4tyFEa1JsVSQxkYfzEpVHifYxzp75pNt7/iNyHL+j4UV/fniFPD2Rm5 duxMtVd2SMqI7SuVfzjRSl7Q5UZvQ0pMuoRytaZsYaxTi2bT/5QSqOEZxTrLhCEypwgg thC4IWiZ9hbhrV2JEf4I1ICl7aeK7relSgtcgAqmw/AP0tWYgjkQKSsPCnBdsfWqFTuM eHvg== 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=QY2hd3xaBYGzu2B/Z53xV/B2Qltf4TvFVkJzB5rw5LA=; b=PutokU77fTohHdIAL2liKUhOcoteq1y8HJZivH1ASBdcuoebEkC/HHWK4fUagKNbAK elfDHbQFdmHVcYjrOy4s/KjvyqtvOsrtZvjO+hWS/pic9ZjU93AGXdvLU9RLZjn274Cb u19bvDIDg18GLax8I7+D58/R7lORXliOne2MuATvT6TmZVe+W3IGkZ4WUUKe5OZYk6vQ u1M5IXz7SbWsfX3ad8a7Mlz1GrphyFjfV+KualKUB0dyGsD5KbY0U/W0DUBQTaxOIGY3 nxpi1Zjeje2/MmHbGaTIeRRLpH9NVKIT55eku6LZxBnOTmfeeJRM+6kLwJLCPagIn7B8 9Mbw== X-Gm-Message-State: ALoCoQkOebtBha6YgYftgBL4tyhIwf3tOLo1YlfXeI59+UQtOiXt9CwGOEYQob/vxfgeXbgsopaShR3KbGTjJEju00c6ID+h+g== X-Received: by 10.28.213.2 with SMTP id m2mr4038657wmg.41.1450279091802; Wed, 16 Dec 2015 07:18:11 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id z17sm6438761wjq.1.2015.12.16.07.18.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:18:11 -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 V2 18/23] x86, acpi, pci: Use equivalent function introduced in previous patch. Date: Wed, 16 Dec 2015 16:16:28 +0100 Message-Id: <1450278993-12664-19-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450278993-12664-1-git-send-email-tn@semihalf.com> References: <1450278993-12664-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,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 5f78595..33233a7 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)); }