From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org, Fam Zheng <famz@redhat.com>,
Yinghai Lu <yhlu.kernel.send@gmail.com>
Subject: [PATCH v3 05/10] pci: make msi/msix shutdown functions static
Date: Tue, 24 Mar 2015 16:42:42 +0100 [thread overview]
Message-ID: <1427211032-2270-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1427211032-2270-1-git-send-email-mst@redhat.com>
pci_msi_shutdown and pci_msix_shutdown are now internal to msi.c, drop
them from header and make them static.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/linux/pci.h | 4 ----
drivers/pci/msi.c | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 211e9da..a34df45 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1209,11 +1209,9 @@ struct msix_entry {
#ifdef CONFIG_PCI_MSI
int pci_msi_vec_count(struct pci_dev *dev);
-void pci_msi_shutdown(struct pci_dev *dev);
void pci_disable_msi(struct pci_dev *dev);
int pci_msix_vec_count(struct pci_dev *dev);
int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec);
-void pci_msix_shutdown(struct pci_dev *dev);
void pci_disable_msix(struct pci_dev *dev);
void pci_restore_msi_state(struct pci_dev *dev);
int pci_msi_enabled(void);
@@ -1237,13 +1235,11 @@ static inline int pci_enable_msix_exact(struct pci_dev *dev,
}
#else
static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
-static inline void pci_msi_shutdown(struct pci_dev *dev) { }
static inline void pci_disable_msi(struct pci_dev *dev) { }
static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; }
static inline int pci_enable_msix(struct pci_dev *dev,
struct msix_entry *entries, int nvec)
{ return -ENOSYS; }
-static inline void pci_msix_shutdown(struct pci_dev *dev) { }
static inline void pci_disable_msix(struct pci_dev *dev) { }
static inline void pci_restore_msi_state(struct pci_dev *dev) { }
static inline int pci_msi_enabled(void) { return 0; }
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index ae3f7cc..a353222 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -887,7 +887,7 @@ int pci_msi_vec_count(struct pci_dev *dev)
}
EXPORT_SYMBOL(pci_msi_vec_count);
-void pci_msi_shutdown(struct pci_dev *dev)
+static void pci_msi_shutdown(struct pci_dev *dev)
{
struct msi_desc *desc;
u32 mask;
@@ -993,7 +993,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
}
EXPORT_SYMBOL(pci_enable_msix);
-void pci_msix_shutdown(struct pci_dev *dev)
+static void pci_msix_shutdown(struct pci_dev *dev)
{
struct msi_desc *entry;
--
MST
next prev parent reply other threads:[~2015-03-24 15:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 15:42 [PATCH v3 00/10] pci: fix unhandled interrupt on shutdown Michael S. Tsirkin
2015-03-24 15:42 ` [PATCH v3 01/10] pci: export functions for msi/msix ctrl Michael S. Tsirkin
2015-03-24 15:42 ` [PATCH v3 02/10] pci: move pci_msi_init_pci_dev to pci.c Michael S. Tsirkin
2015-03-24 15:42 ` [PATCH v3 03/10] pci: drop some duplicate code Michael S. Tsirkin
2015-03-24 23:33 ` Bjorn Helgaas
2015-03-25 5:40 ` Michael S. Tsirkin
2015-03-24 15:42 ` [PATCH v3 04/10] pci: don't disable msi/msix at shutdown Michael S. Tsirkin
2015-03-24 15:42 ` Michael S. Tsirkin [this message]
2015-03-24 15:42 ` [PATCH v3 06/10] virtio_pci: drop msi_off on probe Michael S. Tsirkin
2015-03-24 15:42 ` [PATCH v3 07/10] ntb: drop pci_msi_off call " Michael S. Tsirkin
2015-03-24 16:12 ` Jiang, Dave
2015-03-24 15:42 ` [PATCH v3 08/10] mic: " Michael S. Tsirkin
2015-03-24 15:42 ` [PATCH v3 09/10] pci: drop pci_msi_off calls from quirks Michael S. Tsirkin
2015-03-24 15:43 ` [PATCH v3 10/10] pci: unexport pci_msi_off Michael S. Tsirkin
2015-03-24 17:02 ` [PATCH v3 00/10] pci: fix unhandled interrupt on shutdown Greg KH
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=1427211032-2270-6-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=bhelgaas@google.com \
--cc=famz@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=yhlu.kernel.send@gmail.com \
/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).