From: Christoph Hellwig <hch@lst.de>
To: davem@davemloft.net
Cc: bhelgaas@google.com, netanel@annapurnalabs.com,
jcliburn@gmail.com, chris.snook@gmail.com, sgoutham@cavium.com,
rric@kernel.org, jiri@mellanox.com, idosch@mellanox.com,
netdev@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH 4/5] PCI: remove pci_enable_msix
Date: Tue, 11 Apr 2017 13:01:24 +0200 [thread overview]
Message-ID: <20170411110125.3446-5-hch@lst.de> (raw)
In-Reply-To: <20170411110125.3446-1-hch@lst.de>
Unused now that all callers switched to pci_alloc_irq_vectors.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/msi.c | 21 ---------------------
include/linux/pci.h | 4 ----
2 files changed, 25 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index d571bc330686..0042c365b29b 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -973,27 +973,6 @@ static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries,
return msix_capability_init(dev, entries, nvec, affd);
}
-/**
- * pci_enable_msix - configure device's MSI-X capability structure
- * @dev: pointer to the pci_dev data structure of MSI-X device function
- * @entries: pointer to an array of MSI-X entries (optional)
- * @nvec: number of MSI-X irqs requested for allocation by device driver
- *
- * Setup the MSI-X capability structure of device function with the number
- * of requested irqs upon its software driver call to request for
- * MSI-X mode enabled on its hardware device function. A return of zero
- * indicates the successful configuration of MSI-X capability structure
- * with new allocated MSI-X irqs. A return of < 0 indicates a failure.
- * Or a return of > 0 indicates that driver request is exceeding the number
- * of irqs or MSI-X vectors available. Driver should use the returned value to
- * re-send its request.
- **/
-int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
-{
- return __pci_enable_msix(dev, entries, nvec, NULL);
-}
-EXPORT_SYMBOL(pci_enable_msix);
-
void pci_msix_shutdown(struct pci_dev *dev)
{
struct msi_desc *entry;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index eb3da1a04e6c..82dec36845e6 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1300,7 +1300,6 @@ 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);
@@ -1330,9 +1329,6 @@ 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) { }
--
2.11.0
next prev parent reply other threads:[~2017-04-11 11:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 11:01 remove pci_enable_msix() V3 Christoph Hellwig
2017-04-11 11:01 ` [PATCH 1/5] net: alx: switch to pci_alloc_irq_vectors Christoph Hellwig
2017-04-11 11:01 ` [PATCH 2/5] net/ena: " Christoph Hellwig
2017-04-11 11:01 ` [PATCH 3/5] net: thunderx: Switch " Christoph Hellwig
2017-04-11 11:01 ` Christoph Hellwig [this message]
2017-04-11 11:01 ` [PATCH 5/5] mlxsw: convert " Christoph Hellwig
2017-04-11 15:16 ` remove pci_enable_msix() V3 David Miller
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=20170411110125.3446-5-hch@lst.de \
--to=hch@lst.de \
--cc=bhelgaas@google.com \
--cc=chris.snook@gmail.com \
--cc=davem@davemloft.net \
--cc=idosch@mellanox.com \
--cc=jcliburn@gmail.com \
--cc=jiri@mellanox.com \
--cc=linux-pci@vger.kernel.org \
--cc=netanel@annapurnalabs.com \
--cc=netdev@vger.kernel.org \
--cc=rric@kernel.org \
--cc=sgoutham@cavium.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).