aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-11 16:47:01 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-02-11 17:25:06 -0700
commitcc7ba39bab126339d6d525ada07dea5633d71521 (patch)
tree25e660ec5fef0f99c49a0b6937f6a1b11e0cfd21 /drivers/pci/pci.c
parentPCI: Catch attempts to disable already-disabled devices (diff)
downloadlinux-dev-cc7ba39bab126339d6d525ada07dea5633d71521.tar.xz
linux-dev-cc7ba39bab126339d6d525ada07dea5633d71521.zip
PCI: Use atomic_inc_return() rather than atomic_add_return()
No functional change; just use atomic_inc_return() rather than the general-purpose atomic_add_return(). Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 29a09b705f04..c746b04afd6a 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1174,7 +1174,7 @@ static int __pci_enable_device_flags(struct pci_dev *dev,
dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
}
- if (atomic_add_return(1, &dev->enable_cnt) > 1)
+ if (atomic_inc_return(&dev->enable_cnt) > 1)
return 0; /* already enabled */
/* only skip sriov related */
@@ -1404,7 +1404,7 @@ pci_disable_device(struct pci_dev *dev)
dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0,
"disabling already-disabled device");
- if (atomic_sub_return(1, &dev->enable_cnt) != 0)
+ if (atomic_dec_return(&dev->enable_cnt) != 0)
return;
do_pci_disable_device(dev);