Skip to content

Commit

Permalink
PCI: iproc: Delete unnecessary checks before phy calls
Browse files Browse the repository at this point in the history
The functions phy_exit() and phy_power_off() test whether their argument is
NULL and then return immediately.  Thus the test around the calls is not
needed.

This issue was detected by using the Coccinelle software.

[bhelgaas: also phy_init() and phy_power_on(), as Ray Jui suggested]
[bhelgaas: also remove tests in iproc_pcie_remove()]
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ray Jui <rjui@broadcom.com>
  • Loading branch information
Markus Elfring authored and Bjorn Helgaas committed Jul 14, 2015
1 parent bc0195a commit 93972d1
Showing 1 changed file with 13 additions and 21 deletions.
34 changes: 13 additions & 21 deletions drivers/pci/host/pcie-iproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,16 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
if (!pcie || !pcie->dev || !pcie->base)
return -EINVAL;

if (pcie->phy) {
ret = phy_init(pcie->phy);
if (ret) {
dev_err(pcie->dev, "unable to initialize PCIe PHY\n");
return ret;
}

ret = phy_power_on(pcie->phy);
if (ret) {
dev_err(pcie->dev, "unable to power on PCIe PHY\n");
goto err_exit_phy;
}
ret = phy_init(pcie->phy);
if (ret) {
dev_err(pcie->dev, "unable to initialize PCIe PHY\n");
return ret;
}

ret = phy_power_on(pcie->phy);
if (ret) {
dev_err(pcie->dev, "unable to power on PCIe PHY\n");
goto err_exit_phy;
}

iproc_pcie_reset(pcie);
Expand Down Expand Up @@ -239,12 +236,9 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
pci_remove_root_bus(bus);

err_power_off_phy:
if (pcie->phy)
phy_power_off(pcie->phy);
phy_power_off(pcie->phy);
err_exit_phy:
if (pcie->phy)
phy_exit(pcie->phy);

phy_exit(pcie->phy);
return ret;
}
EXPORT_SYMBOL(iproc_pcie_setup);
Expand All @@ -254,10 +248,8 @@ int iproc_pcie_remove(struct iproc_pcie *pcie)
pci_stop_root_bus(pcie->root_bus);
pci_remove_root_bus(pcie->root_bus);

if (pcie->phy) {
phy_power_off(pcie->phy);
phy_exit(pcie->phy);
}
phy_power_off(pcie->phy);
phy_exit(pcie->phy);

return 0;
}
Expand Down

0 comments on commit 93972d1

Please sign in to comment.