From: Kelsey Skunberg <skunberg.kelsey@gmail.com>
To: linux-pci@vger.kernel.org, bhelgaas@google.com,
linux-kernel@vger.kernel.org
Cc: skhan@linuxfoundation.org,
linux-kernel-mentees@lists.linuxfoundation.org,
skunberg.kelsey@gmail.com
Subject: [PATCH 10/11] PCI: Move PTM declaration to drivers/pci/pci.h
Date: Thu, 11 Jul 2019 16:23:40 -0600 [thread overview]
Message-ID: <20190711222341.111556-11-skunberg.kelsey@gmail.com> (raw)
In-Reply-To: <20190711222341.111556-1-skunberg.kelsey@gmail.com>
pci_enable_ptm() is only called within drivers/pci/. Since declaration
does 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 | 3 +++
include/linux/pci.h | 7 -------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 74249c31325c..95bca00ea85a 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -547,8 +547,11 @@ static inline void pcie_ecrc_get_policy(char *str) { }
#ifdef CONFIG_PCIE_PTM
void pci_ptm_init(struct pci_dev *dev);
+int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);
#else
static inline void pci_ptm_init(struct pci_dev *dev) { }
+static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
+{ return -EINVAL; }
#endif
struct pci_dev_reset_methods {
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8fbe3471e8f0..ea4dfb6b6693 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1503,13 +1503,6 @@ static inline bool pci_aer_available(void) { return false; }
bool pci_ats_disabled(void);
-#ifdef CONFIG_PCIE_PTM
-int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);
-#else
-static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
-{ return -EINVAL; }
-#endif
-
void pci_cfg_access_lock(struct pci_dev *dev);
bool pci_cfg_access_trylock(struct pci_dev *dev);
void pci_cfg_access_unlock(struct pci_dev *dev);
--
2.20.1
next prev parent reply other threads:[~2019-07-11 22:26 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 ` Kelsey Skunberg [this message]
2019-07-11 22:23 ` [PATCH 11/11] PCI: Move pci_*_node() " 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 ` [PATCH v2 11/11] PCI: Move pci_*_node() declarations " Kelsey Skunberg
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=20190711222341.111556-11-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).