aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-11 18:47:01 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-02-11 19:25:06 -0500
commitcc7ba39bab126339d6d525ada07dea5633d71521 (patch)
tree25e660ec5fef0f99c49a0b6937f6a1b11e0cfd21 /drivers/pci
parentfd6dceab017e6be6c158dc56ec6dacf817f21a5b (diff)
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')
-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,
1174 dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK); 1174 dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
1175 } 1175 }
1176 1176
1177 if (atomic_add_return(1, &dev->enable_cnt) > 1) 1177 if (atomic_inc_return(&dev->enable_cnt) > 1)
1178 return 0; /* already enabled */ 1178 return 0; /* already enabled */
1179 1179
1180 /* only skip sriov related */ 1180 /* only skip sriov related */
@@ -1404,7 +1404,7 @@ pci_disable_device(struct pci_dev *dev)
1404 dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0, 1404 dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0,
1405 "disabling already-disabled device"); 1405 "disabling already-disabled device");
1406 1406
1407 if (atomic_sub_return(1, &dev->enable_cnt) != 0) 1407 if (atomic_dec_return(&dev->enable_cnt) != 0)
1408 return; 1408 return;
1409 1409
1410 do_pci_disable_device(dev); 1410 do_pci_disable_device(dev);