UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Elfring 2014-11-10 21:02:17 -07:00 committed by Bjorn Helgaas
parent f114040e3e
commit ff0387c377
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pci/pci-acpi.c
View File

@ -322,8 +322,7 @@ static void pci_acpi_wake_dev(struct work_struct *work)
pci_wakeup_event(pci_dev); pci_wakeup_event(pci_dev);
pm_runtime_resume(&pci_dev->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);
} }
/** /**

3
drivers/pci/probe.c
View File

@ -87,8 +87,7 @@ static void release_pcibus_dev(struct device *dev)
{ {
struct pci_bus *pci_bus = to_pci_bus(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_bus_remove_resources(pci_bus);
pci_release_bus_of_node(pci_bus); pci_release_bus_of_node(pci_bus);
kfree(pci_bus); kfree(pci_bus);

3
drivers/pci/search.c
View File

@ -271,8 +271,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
match_pci_dev_by_id); match_pci_dev_by_id);
if (dev) if (dev)
pdev = to_pci_dev(dev); pdev = to_pci_dev(dev);
if (from) pci_dev_put(from);
pci_dev_put(from);
return pdev; return pdev;
} }

3
drivers/pci/xen-pcifront.c
View File

@ -596,8 +596,7 @@ static pci_ers_result_t pcifront_common_process(int cmd,
pcidev = pci_get_bus_and_slot(bus, devfn); pcidev = pci_get_bus_and_slot(bus, devfn);
if (!pcidev || !pcidev->driver) { if (!pcidev || !pcidev->driver) {
dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n"); dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
if (pcidev) pci_dev_put(pcidev);
pci_dev_put(pcidev);
return result; return result;
} }
pdrv = pcidev->driver; pdrv = pcidev->driver;