diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-05-12 17:54:14 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-05-12 17:54:14 +0200 |
commit | 3f1705d7770d6ff42f369ff7856fb047c8b78e42 (patch) | |
tree | 0ea8bec363bceb3d1f237afb771b9906ba98f34a /target/linux/bcm53xx/patches-4.1/032-PCI-iproc-Delete-unnecessary-checks-before-phy-calls.patch | |
parent | b9c6361d5f6f47149c99b02c2c00e91e0729aec9 (diff) | |
download | upstream-3f1705d7770d6ff42f369ff7856fb047c8b78e42.tar.gz upstream-3f1705d7770d6ff42f369ff7856fb047c8b78e42.tar.bz2 upstream-3f1705d7770d6ff42f369ff7856fb047c8b78e42.zip |
bcm53xx: delete old kernel versions
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.1/032-PCI-iproc-Delete-unnecessary-checks-before-phy-calls.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-4.1/032-PCI-iproc-Delete-unnecessary-checks-before-phy-calls.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/032-PCI-iproc-Delete-unnecessary-checks-before-phy-calls.patch b/target/linux/bcm53xx/patches-4.1/032-PCI-iproc-Delete-unnecessary-checks-before-phy-calls.patch deleted file mode 100644 index fc83337de7..0000000000 --- a/target/linux/bcm53xx/patches-4.1/032-PCI-iproc-Delete-unnecessary-checks-before-phy-calls.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 93972d18bbaba6f34e21742400b6e7461edc4837 Mon Sep 17 00:00:00 2001 -From: Markus Elfring <elfring@users.sourceforge.net> -Date: Sun, 28 Jun 2015 16:42:04 +0200 -Subject: [PATCH] PCI: iproc: Delete unnecessary checks before phy calls - -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> ---- - drivers/pci/host/pcie-iproc.c | 34 +++++++++++++--------------------- - 1 file changed, 13 insertions(+), 21 deletions(-) - ---- a/drivers/pci/host/pcie-iproc.c -+++ b/drivers/pci/host/pcie-iproc.c -@@ -191,19 +191,16 @@ int iproc_pcie_setup(struct iproc_pcie * - 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); -@@ -239,12 +236,9 @@ err_rm_root_bus: - 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); -@@ -254,10 +248,8 @@ int iproc_pcie_remove(struct iproc_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; - } |