summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-07-20 09:23:37 -0500
committerBjorn Helgaas <bhelgaas@google.com>2015-08-13 15:59:59 -0500
commitf7ef1340bb501717372a39f4807d0ad519ebd432 (patch)
tree93e44108a341fe1bcdbd204b3ce0090197ec4913
parenta71f938f3a9a7bc879296cd34ecae9effe5edf3f (diff)
downloadop-kernel-dev-f7ef1340bb501717372a39f4807d0ad519ebd432.zip
op-kernel-dev-f7ef1340bb501717372a39f4807d0ad519ebd432.tar.gz
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>
-rw-r--r--drivers/pci/ats.c6
-rw-r--r--include/linux/pci.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index ceda7dc..eeb9fb2 100644
--- 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 4b484fd..806da76 100644
--- 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);
OpenPOWER on IntegriCloud