From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org, Fam Zheng <famz@redhat.com>,
Yinghai Lu <yhlu.kernel.send@gmail.com>,
Yijing Wang <wangyijing@huawei.com>
Subject: [PATCH v5 10/10] pci: unexport pci_msi_off
Date: Sun, 29 Mar 2015 17:04:34 +0200 [thread overview]
Message-ID: <1427641227-7574-11-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1427641227-7574-1-git-send-email-mst@redhat.com>
Now one should be using pci_msi_off now, unexport it and move the
declaration to internal header to prevent misuse.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/pci/pci.h | 2 ++
include/linux/pci.h | 1 -
drivers/pci/pci.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 17f213d..620fcad 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -146,6 +146,8 @@ static inline void pci_no_msi(void) { }
static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
#endif
+void pci_msi_off(struct pci_dev *dev);
+
static inline void pci_msi_set_enable(struct pci_dev *dev, int enable)
{
u16 control;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a34df45..ef15f91 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -970,7 +970,6 @@ void pci_intx(struct pci_dev *dev, int enable);
bool pci_intx_mask_supported(struct pci_dev *dev);
bool pci_check_and_mask_intx(struct pci_dev *dev);
bool pci_check_and_unmask_intx(struct pci_dev *dev);
-void pci_msi_off(struct pci_dev *dev);
int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size);
int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask);
int pci_wait_for_pending(struct pci_dev *dev, int pos, u16 mask);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fcee8ea..54cefb4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3103,6 +3103,7 @@ EXPORT_SYMBOL_GPL(pci_check_and_unmask_intx);
* If you want to use MSI, see pci_enable_msi() and friends.
* This is a lower-level primitive that allows us to disable
* MSI operation at the device level.
+ * Not for use by drivers.
*/
void pci_msi_off(struct pci_dev *dev)
{
@@ -3112,7 +3113,6 @@ void pci_msi_off(struct pci_dev *dev)
if (dev->msix_cap)
pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);
}
-EXPORT_SYMBOL_GPL(pci_msi_off);
int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size)
{
--
MST
next prev parent reply other threads:[~2015-03-29 15:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-29 15:03 [PATCH v5 00/10] pci: fix unhandled interrupt on shutdown Michael S. Tsirkin
2015-03-29 15:04 ` [PATCH v5 01/10] pci: export functions for msi/msix ctrl Michael S. Tsirkin
2015-04-02 3:31 ` Fam Zheng
2015-03-29 15:04 ` [PATCH v5 02/10] pci: move pci_msi_init_pci_dev to probe.c Michael S. Tsirkin
2015-04-02 3:38 ` Fam Zheng
2015-04-02 5:45 ` Eric W. Biederman
2015-03-29 15:04 ` [PATCH v5 03/10] pci: drop some duplicate code Michael S. Tsirkin
2015-04-02 3:52 ` Fam Zheng
2015-03-29 15:04 ` [PATCH v5 04/10] pci: don't disable msi/msix at shutdown Michael S. Tsirkin
2015-04-02 3:54 ` Fam Zheng
2015-04-10 18:33 ` Bjorn Helgaas
2015-04-12 8:52 ` Michael S. Tsirkin
2015-03-29 15:04 ` [PATCH v5 05/10] pci: make msi/msix shutdown functions static Michael S. Tsirkin
2015-04-02 3:55 ` Fam Zheng
2015-03-29 15:04 ` [PATCH v5 06/10] virtio_pci: drop msi_off on probe Michael S. Tsirkin
2015-04-02 3:55 ` Fam Zheng
2015-03-29 15:04 ` [PATCH v5 07/10] ntb: drop pci_msi_off call " Michael S. Tsirkin
2015-03-29 15:04 ` [PATCH v5 08/10] mic: " Michael S. Tsirkin
2015-03-29 15:04 ` [PATCH v5 09/10] pci: drop pci_msi_off calls from quirks Michael S. Tsirkin
2015-03-29 15:04 ` Michael S. Tsirkin [this message]
2015-04-08 22:16 ` [PATCH v5 00/10] pci: fix unhandled interrupt on shutdown Michael S. Tsirkin
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=1427641227-7574-11-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=wangyijing@huawei.com \
--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).