From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Russell King <linux@arm.linux.org.uk>, <dja@axtens.net>,
<linux-xtensa@linux-xtensa.org>, <x86@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>, <linux-mips@linux-mips.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Rusty Russell <rusty@rustcorp.com.au>,
<linuxppc-dev@lists.ozlabs.org>, <linux-s390@vger.kernel.org>,
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>, <linux-am33-list@redhat.com>,
Liviu Dudau <liviu@dudau.co.uk>, Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Yijing Wang <wangyijing@huawei.com>
Subject: [PATCH part3 v12 02/10] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h
Date: Mon, 20 Jul 2015 20:01:10 +0800 [thread overview]
Message-ID: <1437393678-4077-3-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1437393678-4077-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 4ff0ff1..02192aa 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -335,4 +335,13 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe)
struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus);
+#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 50c0c47..f7e4204 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1337,12 +1337,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
next prev parent reply other threads:[~2015-07-20 12:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 12:01 [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 01/10] PCI: Save domain in pci_host_bridge Yijing Wang
2015-07-20 12:01 ` Yijing Wang [this message]
2015-07-20 12:01 ` [PATCH part3 v12 03/10] PCI: Remove declaration for pci_get_new_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 05/10] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_root_bus_prepare() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 07/10] PCI: Create pci host bridge prior to root bus Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 08/10] PCI: Introduce common pci_domain_nr() and remove platform specific code Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 09/10] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 10/10] IA64/PCI: Fix build warning found by kbuild test Yijing Wang
2015-12-07 21:53 ` [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() Bjorn Helgaas
2015-12-08 1:18 ` wangyijing
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=1437393678-4077-3-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=dja@axtens.net \
--cc=geert@linux-m68k.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-am33-list@redhat.com \
--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-mips@linux-mips.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@arm.linux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liviu@dudau.co.uk \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@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).