OSDN Git Service

3ac92698124bde409924805ac7e92e0d2ef639d4
[immortalwrt/immortalwrt.git] / target / linux / generic / pending-5.15 / 851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch
1 From 9a352062b7e3857742389dff6f64393481dc755e Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
3 Date: Thu, 23 Sep 2021 19:37:05 +0200
4 Subject: [PATCH] Revert "PCI: aardvark: Fix initialization with old Marvell's
5  Arm Trusted Firmware"
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.
11
12 Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return
13 -EOPNOTSUPP from phy_power_on() callback anymore.
14
15 So remove dead code which handles -EOPNOTSUPP return value.
16
17 Signed-off-by: Pali Rohár <pali@kernel.org>
18 Signed-off-by: Marek Behún <kabel@kernel.org>
19 Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
20 ---
21  drivers/pci/controller/pci-aardvark.c | 4 +---
22  1 file changed, 1 insertion(+), 3 deletions(-)
23
24 --- a/drivers/pci/controller/pci-aardvark.c
25 +++ b/drivers/pci/controller/pci-aardvark.c
26 @@ -1634,9 +1634,7 @@ static int advk_pcie_enable_phy(struct a
27         }
28  
29         ret = phy_power_on(pcie->phy);
30 -       if (ret == -EOPNOTSUPP) {
31 -               dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
32 -       } else if (ret) {
33 +       if (ret) {
34                 phy_exit(pcie->phy);
35                 return ret;
36         }