diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-03-09 16:45:14 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-03-09 16:56:54 -0500 |
commit | 688769f643bfce894f14dc7141bfc6c010f52750 (patch) | |
tree | b0ed2ef3f729b76b9b42fa7ca5078e43d91fabc6 | |
parent | fda78d7a0ead144f4b2cdb582dcba47911f4952c (diff) |
PCI/MSI: Make pci_msi_shutdown() and pci_msix_shutdown() static
pci_msi_shutdown() and pci_msix_shutdown() are used only in
drivers/pci/msi.c, so make them static.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r-- | drivers/pci/msi.c | 4 | ||||
-rw-r--r-- | include/linux/pci.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index d571bc330686..4d062c3bf5f0 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
@@ -882,7 +882,7 @@ int pci_msi_vec_count(struct pci_dev *dev) | |||
882 | } | 882 | } |
883 | EXPORT_SYMBOL(pci_msi_vec_count); | 883 | EXPORT_SYMBOL(pci_msi_vec_count); |
884 | 884 | ||
885 | void pci_msi_shutdown(struct pci_dev *dev) | 885 | static void pci_msi_shutdown(struct pci_dev *dev) |
886 | { | 886 | { |
887 | struct msi_desc *desc; | 887 | struct msi_desc *desc; |
888 | u32 mask; | 888 | u32 mask; |
@@ -994,7 +994,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec) | |||
994 | } | 994 | } |
995 | EXPORT_SYMBOL(pci_enable_msix); | 995 | EXPORT_SYMBOL(pci_enable_msix); |
996 | 996 | ||
997 | void pci_msix_shutdown(struct pci_dev *dev) | 997 | static void pci_msix_shutdown(struct pci_dev *dev) |
998 | { | 998 | { |
999 | struct msi_desc *entry; | 999 | struct msi_desc *entry; |
1000 | 1000 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index eb3da1a04e6c..10917c122974 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -1297,11 +1297,9 @@ struct msix_entry { | |||
1297 | 1297 | ||
1298 | #ifdef CONFIG_PCI_MSI | 1298 | #ifdef CONFIG_PCI_MSI |
1299 | int pci_msi_vec_count(struct pci_dev *dev); | 1299 | int pci_msi_vec_count(struct pci_dev *dev); |
1300 | void pci_msi_shutdown(struct pci_dev *dev); | ||
1301 | void pci_disable_msi(struct pci_dev *dev); | 1300 | void pci_disable_msi(struct pci_dev *dev); |
1302 | int pci_msix_vec_count(struct pci_dev *dev); | 1301 | int pci_msix_vec_count(struct pci_dev *dev); |
1303 | int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec); | 1302 | int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec); |
1304 | void pci_msix_shutdown(struct pci_dev *dev); | ||
1305 | void pci_disable_msix(struct pci_dev *dev); | 1303 | void pci_disable_msix(struct pci_dev *dev); |
1306 | void pci_restore_msi_state(struct pci_dev *dev); | 1304 | void pci_restore_msi_state(struct pci_dev *dev); |
1307 | int pci_msi_enabled(void); | 1305 | int pci_msi_enabled(void); |
@@ -1327,13 +1325,11 @@ int pci_irq_get_node(struct pci_dev *pdev, int vec); | |||
1327 | 1325 | ||
1328 | #else | 1326 | #else |
1329 | static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; } | 1327 | static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; } |
1330 | static inline void pci_msi_shutdown(struct pci_dev *dev) { } | ||
1331 | static inline void pci_disable_msi(struct pci_dev *dev) { } | 1328 | static inline void pci_disable_msi(struct pci_dev *dev) { } |
1332 | static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; } | 1329 | static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; } |
1333 | static inline int pci_enable_msix(struct pci_dev *dev, | 1330 | static inline int pci_enable_msix(struct pci_dev *dev, |
1334 | struct msix_entry *entries, int nvec) | 1331 | struct msix_entry *entries, int nvec) |
1335 | { return -ENOSYS; } | 1332 | { return -ENOSYS; } |
1336 | static inline void pci_msix_shutdown(struct pci_dev *dev) { } | ||
1337 | static inline void pci_disable_msix(struct pci_dev *dev) { } | 1333 | static inline void pci_disable_msix(struct pci_dev *dev) { } |
1338 | static inline void pci_restore_msi_state(struct pci_dev *dev) { } | 1334 | static inline void pci_restore_msi_state(struct pci_dev *dev) { } |
1339 | static inline int pci_msi_enabled(void) { return 0; } | 1335 | static inline int pci_msi_enabled(void) { return 0; } |