redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

PCI: iproc: Delete unnecessary checks before phy calls

Browse source 
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>
This commit is contained in:
Markus Elfring 2015-06-28 16:42:04 +02:00 committed by Bjorn Helgaas
parent bc0195aad0
commit 93972d18bb
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/pci/host/pcie-iproc.c
View file

@ -191,19 +191,16 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
if (!pcie || !pcie->dev || !pcie->base) if (!pcie || !pcie->dev || !pcie->base)
return -EINVAL; return -EINVAL;
if (pcie->phy) { ret = phy_init(pcie->phy);
ret = phy_init(pcie->phy); if (ret) {
if (ret) { dev_err(pcie->dev, "unable to initialize PCIe PHY\n");
dev_err(pcie->dev, "unable to initialize PCIe PHY\n"); return ret;
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_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); iproc_pcie_reset(pcie);
@ -239,12 +236,9 @@ err_rm_root_bus:
pci_remove_root_bus(bus); pci_remove_root_bus(bus);
err_power_off_phy: err_power_off_phy:
if (pcie->phy) phy_power_off(pcie->phy);
phy_power_off(pcie->phy);
err_exit_phy: err_exit_phy:
if (pcie->phy) phy_exit(pcie->phy);
phy_exit(pcie->phy);
return ret; return ret;
} }
EXPORT_SYMBOL(iproc_pcie_setup); EXPORT_SYMBOL(iproc_pcie_setup);
@ -254,10 +248,8 @@ int iproc_pcie_remove(struct iproc_pcie *pcie)
pci_stop_root_bus(pcie->root_bus); pci_stop_root_bus(pcie->root_bus);
pci_remove_root_bus(pcie->root_bus); pci_remove_root_bus(pcie->root_bus);
if (pcie->phy) { phy_power_off(pcie->phy);
phy_power_off(pcie->phy); phy_exit(pcie->phy);
phy_exit(pcie->phy);
}
return 0; return 0;
} }