PCI: Delete unnecessary NULL pointer checks

The functions pci_dev_put(), pci_pme_wakeup_bus(), and put_device() return
immediately if their argument is NULL.  Thus the test before the call is
not needed.

Remove these unnecessary tests.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 6ebf8edc5f3c5cbff635ec30cab5d342616b8ab8..3542150fc8a3fc247cd99777f588d30a93a99c41 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -322,8 +322,7 @@ static void pci_acpi_wake_dev(struct work_struct *work)
        pci_wakeup_event(pci_dev);
        pm_runtime_resume(&pci_dev->dev);
 
-       if (pci_dev->subordinate)
-               pci_pme_wakeup_bus(pci_dev->subordinate);
+       pci_pme_wakeup_bus(pci_dev->subordinate);
 }
 
 /**

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 5ed99309c75800938b666c5c523d7ea3ca07d51f..eb927c04e29068a061be31af33c6aeb3277b10ec 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -87,8 +87,7 @@ static void release_pcibus_dev(struct device *dev)
 {
        struct pci_bus *pci_bus = to_pci_bus(dev);
 
-       if (pci_bus->bridge)
-               put_device(pci_bus->bridge);
+       put_device(pci_bus->bridge);
        pci_bus_remove_resources(pci_bus);
        pci_release_bus_of_node(pci_bus);
        kfree(pci_bus);

diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index a81f413083e49e5751013bf4f0602a2605286dc2..a20ce7d5e2a718551554a1e860457b852756d97b 100644 (file)
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -271,8 +271,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
                              match_pci_dev_by_id);
        if (dev)
                pdev = to_pci_dev(dev);
-       if (from)
-               pci_dev_put(from);
+       pci_dev_put(from);
        return pdev;
 }
 

diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 116ca3746adb47cd5887bad8b8014ccdb5641b9c..f01b26dc83a45d64914b383a1cce9522461ad1df 100644 (file)
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -596,8 +596,7 @@ static pci_ers_result_t pcifront_common_process(int cmd,
        pcidev = pci_get_bus_and_slot(bus, devfn);
        if (!pcidev || !pcidev->driver) {
                dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
-               if (pcidev)
-                       pci_dev_put(pcidev);
+               pci_dev_put(pcidev);
                return result;
        }
        pdrv = pcidev->driver;