From: Kelsey Skunberg <skunberg.kelsey@gmail.com>
To: bhelgaas@google.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: skunberg.kelsey@gmail.com,
linux-kernel-mentees@lists.linuxfoundation.org,
skhan@linuxfoundation.org
Subject: [PATCH v2 11/11] PCI: Move pci_*_node() declarations to drivers/pci/pci.h
Date: Wed, 24 Jul 2019 17:38:48 -0600 [thread overview]
Message-ID: <20190724233848.73327-12-skunberg.kelsey@gmail.com> (raw)
In-Reply-To: <20190724233848.73327-1-skunberg.kelsey@gmail.com>
pci_*_node() is only called from drivers/pci/. Since these declarations do
not need to be visible to the rest of the kernel, move to
drivers/pci/pci.h.
Signed-off-by: Kelsey Skunberg <skunberg.kelsey@gmail.com>
---
drivers/pci/pci.h | 9 +++++++++
include/linux/pci.h | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6cdc3500de15..27089a87dfea 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -592,6 +592,10 @@ struct device_node;
int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
int of_get_pci_domain_nr(struct device_node *node);
int of_pci_get_max_link_speed(struct device_node *node);
+void pci_set_of_node(struct pci_dev *dev);
+void pci_release_of_node(struct pci_dev *dev);
+void pci_set_bus_of_node(struct pci_bus *bus);
+void pci_release_bus_of_node(struct pci_bus *bus);
#else
static inline int
@@ -611,6 +615,11 @@ of_pci_get_max_link_speed(struct device_node *node)
{
return -EINVAL;
}
+
+static inline void pci_set_of_node(struct pci_dev *dev) { }
+static inline void pci_release_of_node(struct pci_dev *dev) { }
+static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
+static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
#endif /* CONFIG_OF */
#if defined(CONFIG_OF_ADDRESS)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a483b7598059..d354fbcee5a7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2264,10 +2264,6 @@ int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off,
#ifdef CONFIG_OF
struct device_node;
struct irq_domain;
-void pci_set_of_node(struct pci_dev *dev);
-void pci_release_of_node(struct pci_dev *dev);
-void pci_set_bus_of_node(struct pci_bus *bus);
-void pci_release_bus_of_node(struct pci_bus *bus);
struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
int pci_parse_request_of_pci_ranges(struct device *dev,
struct list_head *resources,
@@ -2277,10 +2273,6 @@ int pci_parse_request_of_pci_ranges(struct device *dev,
struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
#else /* CONFIG_OF */
-static inline void pci_set_of_node(struct pci_dev *dev) { }
-static inline void pci_release_of_node(struct pci_dev *dev) { }
-static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
-static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
static inline struct irq_domain *
pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }
static inline int pci_parse_request_of_pci_ranges(struct device *dev,
--
2.20.1
next prev parent reply other threads:[~2019-07-24 23:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 22:23 [PATCH 00/11] PCI: Move symbols to drivers/pci/pci.h Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 01/11] PCI: Move #define PCI_PM_* lines " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 02/11] PCI: Move PME declarations " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 03/11] PCI: Move *_host_bridge_device() declarations to drivers/pci.pci.h Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 04/11] PCI: Move PCI Virtual Channel declarations to drivers/pci/pci.h Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 05/11] PCI: Move pci_hotplug_*_size " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 06/11] PCI: Move pci_bus_* " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 07/11] PCI: Move pcie_update_link_speed() " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 08/11] PCI: Move pci_ats_init() " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 09/11] PCI: Move ECRC declarations " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 10/11] PCI: Move PTM declaration " Kelsey Skunberg
2019-07-11 22:23 ` [PATCH 11/11] PCI: Move pci_*_node() declarations " Kelsey Skunberg
2019-07-23 23:07 ` [PATCH 00/11] PCI: Move symbols " Bjorn Helgaas
2019-07-23 23:24 ` Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 00/11] Hide PCI symbols that don't need to be global Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 01/11] PCI: Move #define PCI_PM_* lines to drivers/pci/pci.h Kelsey Skunberg
2019-07-29 21:44 ` [Linux-kernel-mentees] " Bjorn Helgaas
2019-07-24 23:38 ` [PATCH v2 02/11] PCI: Move PME declarations " Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 03/11] PCI: Move *_host_bridge_device() declarations to drivers/pci.pci.h Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 04/11] PCI: Move PCI Virtual Channel declarations to drivers/pci/pci.h Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 05/11] PCI: Move pci_hotplug_*_size " Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 06/11] PCI: Move pci_bus_* " Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 07/11] PCI: Move pcie_update_link_speed() " Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 08/11] PCI: Move pci_ats_init() " Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 09/11] PCI: Move ECRC declarations " Kelsey Skunberg
2019-07-24 23:38 ` [PATCH v2 10/11] PCI: Move PTM declaration " Kelsey Skunberg
2019-07-24 23:38 ` Kelsey Skunberg [this message]
2019-07-30 13:47 ` [Linux-kernel-mentees] [PATCH v2 00/11] Hide PCI symbols that don't need to be global Bjorn Helgaas
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=20190724233848.73327-12-skunberg.kelsey@gmail.com \
--to=skunberg.kelsey@gmail.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=skhan@linuxfoundation.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).