linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
	<linux-pci@vger.kernel.org>, Yinghai Lu <yinghai@kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	<linux-arm-kernel@lists.infradead.org>,
	Russell King <linux@arm.linux.org.uk>, <x86@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Rusty Russell <rusty@rustcorp.com.au>,
	Tony Luck <tony.luck@intel.com>, <linux-ia64@vger.kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	"Guan Xuetao" <gxt@mprc.pku.edu.cn>,
	<linux-alpha@vger.kernel.org>, <linux-m68k@lists.linux-m68k.org>,
	Liviu Dudau <liviu@dudau.co.uk>, "Arnd Bergmann" <arnd@arndb.de>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	"Yijing Wang" <wangyijing@huawei.com>
Subject: [PATCH v8 04/30] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h
Date: Tue, 24 Mar 2015 11:33:58 +0800	[thread overview]
Message-ID: <1427168064-8657-5-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1427168064-8657-1-git-send-email-wangyijing@huawei.com>

pci_bus_assign_domain_nr() is only called in probe.c,
Move pci_bus_assign_domain_nr() declaration into
drivers/pci/pci.h.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
 drivers/pci/pci.h   |    9 +++++++++
 include/linux/pci.h |    6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 4091f82..ba1bcce 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -321,4 +321,13 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe)
 }
 #endif
 
+#ifdef CONFIG_PCI_DOMAINS_GENERIC
+void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent);
+#else
+static inline void pci_bus_assign_domain_nr(struct pci_bus *bus,
+					struct device *parent)
+{
+}
+#endif
+
 #endif /* DRIVERS_PCI_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 2b575bc..1542df8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1327,12 +1327,6 @@ static inline int pci_domain_nr(struct pci_bus *bus)
 {
 	return bus->domain_nr;
 }
-void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent);
-#else
-static inline void pci_bus_assign_domain_nr(struct pci_bus *bus,
-					struct device *parent)
-{
-}
 #endif
 
 /* some architectures require additional setup to direct VGA traffic */
-- 
1.7.1


  parent reply	other threads:[~2015-03-24  3:33 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-24  3:33 [PATCH v8 00/30] Refine PCI scan interfaces and make generic pci host bridge Yijing Wang
2015-03-24  3:33 ` [PATCH v8 01/30] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-03-24  3:33 ` [PATCH v8 02/30] PCI: Remove deprecated pci_scan_bus_parented() Yijing Wang
2015-03-24  3:33 ` [PATCH v8 03/30] PCI: Save domain in pci_host_bridge Yijing Wang
2015-03-24  3:33 ` Yijing Wang [this message]
2015-03-24  3:33 ` [PATCH v8 05/30] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-03-24  3:34 ` [PATCH v8 06/30] PCI: Separate pci_host_bridge creation out of pci_create_root_bus() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 07/30] PCI: Add default bus resource in pci_host_bridge Yijing Wang
2015-03-24  3:34 ` [PATCH v8 08/30] PCI: Update pci_host_bridge bus resource Yijing Wang
2015-03-24  3:34 ` [PATCH v8 09/30] PCI: Introduce pci_host_first_busnr() function Yijing Wang
2015-03-24  3:34 ` [PATCH v8 10/30] PCI: Introduce pci_host_bridge_list to manage host bridges Yijing Wang
2015-03-25 16:42   ` Tomasz Nowicki
2015-03-26  1:34     ` Yijing Wang
2015-03-26 16:31   ` Yinghai Lu
2015-03-27  2:31     ` Yijing Wang
2015-03-24  3:34 ` [PATCH v8 11/30] PCI: Save sysdata in pci_host_bridge drvdata Yijing Wang
2015-03-24  3:34 ` [PATCH v8 12/30] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_set_root_bus_speed() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 13/30] PCI: Move pcibios_root_bridge_prepare() to pci_create_host_bridge() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 14/30] PCI: Introduce pci_host_bridge_ops to support host specific operations Yijing Wang
2015-03-24  3:34 ` [PATCH v8 15/30] PCI: Introduce new scan function pci_scan_host_bridge() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 16/30] PCI: Introduce pci_bus_child_max_busnr() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 17/30] x86/PCI: Refine pci_acpi_scan_root() with generic pci_host_bridge Yijing Wang
2015-03-24  3:34 ` [PATCH v8 18/30] ia64/PCI: " Yijing Wang
2015-03-24  3:34 ` [PATCH v8 19/30] powerpc/pci: Use pci_scan_host_bridge() for simplicity Yijing Wang
2015-03-24 23:58   ` Daniel Axtens
2015-03-25  7:42     ` Yijing Wang
2015-03-25 22:13       ` Daniel Axtens
2015-03-26  1:17         ` Yijing Wang
2015-03-26  5:19           ` Daniel Axtens
2015-03-26  6:20             ` Yijing Wang
2015-03-24  3:34 ` [PATCH v8 20/30] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 21/30] sparc/PCI: Use pci_scan_host_bridge() for simplicity Yijing Wang
2015-03-24  3:34 ` [PATCH v8 22/30] parisc/PCI: Use pci_scan_root_bus() " Yijing Wang
2015-03-24  3:34 ` [PATCH v8 23/30] PCI/mvebu: Use pci_common_init_dev() to simplify code Yijing Wang
2015-03-25  8:55   ` Yijing Wang
2015-03-25 16:43     ` Thomas Petazzoni
2015-03-24  3:34 ` [PATCH v8 24/30] PCI/tegra: Remove redundant tegra_pcie_scan_bus() Yijing Wang
2015-03-24 12:31   ` Thierry Reding
2015-03-25  1:22     ` Yijing Wang
2015-03-24  3:34 ` [PATCH v8 25/30] PCI/designware: Use pci_scan_root_bus() for simplicity Yijing Wang
2015-03-24  3:34 ` [PATCH v8 26/30] PCI/xgene: Use pci_scan_root_bus() instead of pci_create_root_bus() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 27/30] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 28/30] PCI: Remove platform specific pci_domain_nr() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 29/30] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-03-24  3:34 ` [PATCH v8 30/30] PCI: Clean up CONFIG_PCI_DOMAINS_GENERIC Yijing Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427168064-8657-5-git-send-email-wangyijing@huawei.com \
    --to=wangyijing@huawei.com \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=geert@linux-m68k.org \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=jiang.liu@linux.intel.com \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=liviu@dudau.co.uk \
    --cc=marc.zyngier@arm.com \
    --cc=rusty@rustcorp.com.au \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=x86@kernel.org \
    --cc=yinghai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).