| Message ID | 20150717213247.18379.66315.stgit@bhelgaas-glaptop2.roam.corp.google.com |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Jul 17, 2015 at 04:32:47PM -0500, Bjorn Helgaas wrote: > Move ATS declarations to linux/pci.h so they're all in one place. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > include/linux/pci-ats.h | 41 ----------------------------------------- > include/linux/pci.h | 8 ++++++++ > 2 files changed, 8 insertions(+), 41 deletions(-) > > diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h > index 5d81d47..57e0b82 100644 > --- a/include/linux/pci-ats.h > +++ b/include/linux/pci-ats.h > @@ -3,47 +3,6 @@ > > #include <linux/pci.h> > > -/* Address Translation Service */ > -#ifdef CONFIG_PCI_ATS > - > -int pci_enable_ats(struct pci_dev *dev, int ps); > -void pci_disable_ats(struct pci_dev *dev); > -int pci_ats_queue_depth(struct pci_dev *dev); > - > -/** > - * pci_ats_enabled - query the ATS status > - * @dev: the PCI device > - * > - * Returns 1 if ATS capability is enabled, or 0 if not. > - */ > -static inline int pci_ats_enabled(struct pci_dev *dev) > -{ > - return dev->ats_cap && dev->ats_enabled; > -} > - > -#else /* CONFIG_PCI_ATS */ > - > -static inline int pci_enable_ats(struct pci_dev *dev, int ps) > -{ > - return -ENODEV; > -} > - > -static inline void pci_disable_ats(struct pci_dev *dev) > -{ > -} > - > -static inline int pci_ats_queue_depth(struct pci_dev *dev) > -{ > - return -ENODEV; > -} > - > -static inline int pci_ats_enabled(struct pci_dev *dev) > -{ > - return 0; > -} > - > -#endif /* CONFIG_PCI_ATS */ > - > #ifdef CONFIG_PCI_PRI > > int pci_enable_pri(struct pci_dev *pdev, u32 reqs); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 1997853..744a5e9 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1300,8 +1300,16 @@ void ht_destroy_irq(unsigned int irq); > #ifdef CONFIG_PCI_ATS > /* Address Translation Service */ > void pci_ats_init(struct pci_dev *dev); > +int pci_enable_ats(struct pci_dev *dev, int ps); > +void pci_disable_ats(struct pci_dev *dev); > +int pci_ats_queue_depth(struct pci_dev *dev); > +static inline int pci_ats_enabled(struct pci_dev *dev) { return dev->ats_enabled; } > #else > static inline void pci_ats_init(struct pci_dev *) { } > +static inline int pci_enable_ats(struct pci_dev *, int) { return -ENODEV; } > +static inline void pci_disable_ats(struct pci_dev *) { } > +static inline int pci_ats_queue_depth(struct pci_dev *) { return -ENODEV; } > +static inline int pci_ats_enabled(struct pci_dev *dev) { return 0; } > #endif > > void pci_cfg_access_lock(struct pci_dev *dev); Reviewed-by: Joerg Roedel <jroedel@suse.de> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index 5d81d47..57e0b82 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -3,47 +3,6 @@ #include <linux/pci.h> -/* Address Translation Service */ -#ifdef CONFIG_PCI_ATS - -int pci_enable_ats(struct pci_dev *dev, int ps); -void pci_disable_ats(struct pci_dev *dev); -int pci_ats_queue_depth(struct pci_dev *dev); - -/** - * pci_ats_enabled - query the ATS status - * @dev: the PCI device - * - * Returns 1 if ATS capability is enabled, or 0 if not. - */ -static inline int pci_ats_enabled(struct pci_dev *dev) -{ - return dev->ats_cap && dev->ats_enabled; -} - -#else /* CONFIG_PCI_ATS */ - -static inline int pci_enable_ats(struct pci_dev *dev, int ps) -{ - return -ENODEV; -} - -static inline void pci_disable_ats(struct pci_dev *dev) -{ -} - -static inline int pci_ats_queue_depth(struct pci_dev *dev) -{ - return -ENODEV; -} - -static inline int pci_ats_enabled(struct pci_dev *dev) -{ - return 0; -} - -#endif /* CONFIG_PCI_ATS */ - #ifdef CONFIG_PCI_PRI int pci_enable_pri(struct pci_dev *pdev, u32 reqs); diff --git a/include/linux/pci.h b/include/linux/pci.h index 1997853..744a5e9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1300,8 +1300,16 @@ void ht_destroy_irq(unsigned int irq); #ifdef CONFIG_PCI_ATS /* Address Translation Service */ void pci_ats_init(struct pci_dev *dev); +int pci_enable_ats(struct pci_dev *dev, int ps); +void pci_disable_ats(struct pci_dev *dev); +int pci_ats_queue_depth(struct pci_dev *dev); +static inline int pci_ats_enabled(struct pci_dev *dev) { return dev->ats_enabled; } #else static inline void pci_ats_init(struct pci_dev *) { } +static inline int pci_enable_ats(struct pci_dev *, int) { return -ENODEV; } +static inline void pci_disable_ats(struct pci_dev *) { } +static inline int pci_ats_queue_depth(struct pci_dev *) { return -ENODEV; } +static inline int pci_ats_enabled(struct pci_dev *dev) { return 0; } #endif void pci_cfg_access_lock(struct pci_dev *dev);
Move ATS declarations to linux/pci.h so they're all in one place. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- include/linux/pci-ats.h | 41 ----------------------------------------- include/linux/pci.h | 8 ++++++++ 2 files changed, 8 insertions(+), 41 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html