Skip to content

Commit

Permalink
PCI: Remove pci_ats_enabled()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas committed Aug 13, 2015
1 parent a71f938 commit f7ef134
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/pci/ats.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f7ef134

Please sign in to comment.