]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
PCI: Use atomic_inc_return() rather than atomic_add_return()
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 11 Feb 2013 23:47:01 +0000 (16:47 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Feb 2013 00:25:06 +0000 (17:25 -0700)
No functional change; just use atomic_inc_return() rather than the
general-purpose atomic_add_return().

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/pci.c

index 29a09b705f04e6a7da8069db923cd883599b5e36..c746b04afd6a8e0769f27888e4af57344e89917b 100644 (file)
@@ -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);