| Message ID | 20191009225354.181018-2-helgaas@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI/ATS: Clean up unnecessary stubs and exports | expand |
On 10/9/19 3:53 PM, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > The following functions are only used by amd_iommu.c and intel-iommu.c > (when CONFIG_INTEL_IOMMU_SVM is enabled). CONFIG_PCI_PRI and > CONFIG_PCI_PASID are always defined in those cases, so there's no need for > the stubs. > > pci_enable_pri() > pci_disable_pri() > pci_reset_pri() > pci_prg_resp_pasid_required() > pci_enable_pasid() > pci_disable_pasid() > > Remove the unused stubs. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Looks good to me. Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> > --- > include/linux/pci-ats.h | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h > index 67de3a9499bb..963c11f7c56b 100644 > --- a/include/linux/pci-ats.h > +++ b/include/linux/pci-ats.h > @@ -27,14 +27,7 @@ void pci_restore_pri_state(struct pci_dev *pdev); > int pci_reset_pri(struct pci_dev *pdev); > int pci_prg_resp_pasid_required(struct pci_dev *pdev); > #else /* CONFIG_PCI_PRI */ > -static inline int pci_enable_pri(struct pci_dev *pdev, u32 reqs) > -{ return -ENODEV; } > -static inline void pci_disable_pri(struct pci_dev *pdev) { } > static inline void pci_restore_pri_state(struct pci_dev *pdev) { } > -static inline int pci_reset_pri(struct pci_dev *pdev) > -{ return -ENODEV; } > -static inline int pci_prg_resp_pasid_required(struct pci_dev *pdev) > -{ return 0; } > #endif /* CONFIG_PCI_PRI */ > > #ifdef CONFIG_PCI_PASID > @@ -44,9 +37,6 @@ void pci_restore_pasid_state(struct pci_dev *pdev); > int pci_pasid_features(struct pci_dev *pdev); > int pci_max_pasids(struct pci_dev *pdev); > #else /* CONFIG_PCI_PASID */ > -static inline int pci_enable_pasid(struct pci_dev *pdev, int features) > -{ return -EINVAL; } > -static inline void pci_disable_pasid(struct pci_dev *pdev) { } > static inline void pci_restore_pasid_state(struct pci_dev *pdev) { } > static inline int pci_pasid_features(struct pci_dev *pdev) > { return -EINVAL; }
diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index 67de3a9499bb..963c11f7c56b 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -27,14 +27,7 @@ void pci_restore_pri_state(struct pci_dev *pdev); int pci_reset_pri(struct pci_dev *pdev); int pci_prg_resp_pasid_required(struct pci_dev *pdev); #else /* CONFIG_PCI_PRI */ -static inline int pci_enable_pri(struct pci_dev *pdev, u32 reqs) -{ return -ENODEV; } -static inline void pci_disable_pri(struct pci_dev *pdev) { } static inline void pci_restore_pri_state(struct pci_dev *pdev) { } -static inline int pci_reset_pri(struct pci_dev *pdev) -{ return -ENODEV; } -static inline int pci_prg_resp_pasid_required(struct pci_dev *pdev) -{ return 0; } #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID @@ -44,9 +37,6 @@ void pci_restore_pasid_state(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid(struct pci_dev *pdev, int features) -{ return -EINVAL; } -static inline void pci_disable_pasid(struct pci_dev *pdev) { } static inline void pci_restore_pasid_state(struct pci_dev *pdev) { } static inline int pci_pasid_features(struct pci_dev *pdev) { return -EINVAL; }