From patchwork Fri Apr 3 09:26:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6155731 Return-Path: X-Original-To: patchwork-linux-arm@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 EA4F39F1BE for ; Fri, 3 Apr 2015 10:01:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 187FE203E1 for ; Fri, 3 Apr 2015 10:01:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2780A203DF for ; Fri, 3 Apr 2015 10:01:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdyMq-0000tk-8h; Fri, 03 Apr 2015 09:58:24 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydy1p-0005yZ-Tx for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 09:36:43 +0000 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BDZ43850; Fri, 03 Apr 2015 17:29:15 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 17:29:06 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v9 30/30] PCI: Clean up CONFIG_PCI_DOMAINS_GENERIC Date: Fri, 3 Apr 2015 17:26:04 +0800 Message-ID: <1428053164-28277-32-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> References: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.551E5D6C.00AD, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: df72e5fd42073720bd1612f3ab5ca622 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150403_023642_345140_9BFB6B7B X-CRM114-Status: GOOD ( 10.35 ) X-Spam-Score: -2.3 (--) Cc: linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Yijing Wang , Guan Xuetao , Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , Arnd Bergmann , Marc Zyngier , Rusty Russell , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Yinghai Lu , linux-arm-kernel@lists.infradead.org, dja@axtens.net, Liviu Dudau , Tony Luck , linux-kernel@vger.kernel.org, Jiang Liu , linux-alpha@vger.kernel.org, "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Now we could clean up CONFIG_PCI_DOMAINS_GENERIC. Signed-off-by: Yijing Wang --- arch/arm/Kconfig | 3 --- arch/arm64/Kconfig | 3 --- drivers/pci/host-bridge.c | 11 ++++++----- drivers/pci/pci.c | 2 -- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f1f09a..b5dab6c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1283,9 +1283,6 @@ config PCI_DOMAINS bool depends on PCI -config PCI_DOMAINS_GENERIC - def_bool PCI_DOMAINS - config PCI_NANOENGINE bool "BSE nanoEngine PCI support" depends on SA1100_NANOENGINE diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1b8e973..4b1cc27 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -242,9 +242,6 @@ config PCI config PCI_DOMAINS def_bool PCI -config PCI_DOMAINS_GENERIC - def_bool PCI - config PCI_SYSCALL def_bool PCI diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index f193136..eb901b2 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -4,6 +4,8 @@ #include #include +#include +#include #include #include "pci.h" @@ -82,12 +84,13 @@ struct pci_host_bridge *pci_create_host_bridge( resource_list_for_each_entry_safe(window, n, resources) list_move_tail(&window->node, &host->windows); /* - * If support CONFIG_PCI_DOMAINS_GENERIC, use + * If domain == -1, we need to use * pci_host_assign_domain_nr() to update domain * number. */ host->domain = domain; - pci_host_assign_domain_nr(host); + if (host->domain == -1) + pci_host_assign_domain_nr(host); mutex_lock(&pci_host_mutex); list_for_each_entry(tmp, &pci_host_bridge_list, list) { if (tmp->domain == host->domain @@ -169,7 +172,6 @@ int pci_get_new_domain_nr(void) return atomic_inc_return(&__domain_nr); } -#ifdef CONFIG_PCI_DOMAINS_GENERIC static int pci_assign_domain_nr(struct device *dev) { static int use_dt_domains = -1; @@ -215,11 +217,10 @@ static int pci_assign_domain_nr(struct device *dev) return domain; } #endif -#endif static void pci_host_assign_domain_nr(struct pci_host_bridge *host) { -#ifdef CONFIG_PCI_DOMAINS_GENERIC +#ifdef CONFIG_PCI_DOMAINS host->domain = pci_assign_domain_nr(host->dev.parent); #endif } diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 044801c..5b18429 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -10,8 +10,6 @@ #include #include #include -#include -#include #include #include #include