PCI: Remove pci_ats_enabled()

Remove pci_ats_enabled().  There are no callers outside the ATS code
itself.  We don't need to check ats_cap, because if we don't find an ATS
capability, we'll never set ats_enabled.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index ceda7dc556d4f79e7cc70621ac453a59146dd97a..eeb9fb2b47aa07f01381a7cd82b2c73f93206fed 100644 (file)
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -43,7 +43,7 @@ int pci_enable_ats(struct pci_dev *dev, int ps)
        if (!dev->ats_cap)
                return -EINVAL;
 
-       if (WARN_ON(pci_ats_enabled(dev)))
+       if (WARN_ON(dev->ats_enabled))
                return -EBUSY;
 
        if (ps < PCI_ATS_MIN_STU)
@@ -80,7 +80,7 @@ void pci_disable_ats(struct pci_dev *dev)
        struct pci_dev *pdev;
        u16 ctrl;
 
-       if (WARN_ON(!pci_ats_enabled(dev)))
+       if (WARN_ON(!dev->ats_enabled))
                return;
 
        if (atomic_read(&dev->ats_ref_cnt))
@@ -103,7 +103,7 @@ void pci_restore_ats_state(struct pci_dev *dev)
 {
        u16 ctrl;
 
-       if (!pci_ats_enabled(dev))
+       if (!dev->ats_enabled)
                return;
 
        ctrl = PCI_ATS_CTRL_ENABLE;

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4b484fdfd66fb3ad1f3cc38a339710107b581bf5..806da7634f91b90cca6d8b684f134eb942d63e01 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1303,13 +1303,11 @@ 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_cap && dev->ats_enabled; }
 #else
 static inline void pci_ats_init(struct pci_dev *d) { }
 static inline int pci_enable_ats(struct pci_dev *d, int ps) { return -ENODEV; }
 static inline void pci_disable_ats(struct pci_dev *d) { }
 static inline int pci_ats_queue_depth(struct pci_dev *d) { return -ENODEV; }
-static inline int pci_ats_enabled(struct pci_dev *d) { return 0; }
 #endif
 
 void pci_cfg_access_lock(struct pci_dev *dev);