diff mbox series

[phy,v4,5/5] Revert "PCI: aardvark: Fix initialization with old Marvell's Arm Trusted Firmware"

Message ID 20220224151718.7679-1-kabel@kernel.org (mailing list archive)
State Accepted
Commit 9a4556dad7bd0a6b8339cb72e169f5c76f2af6f1
Headers show
Series None | expand

Commit Message

Marek Behún Feb. 24, 2022, 3:17 p.m. UTC 
From: Pali Rohár <pali@kernel.org>

This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.

Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return
-EOPNOTSUPP from phy_power_on() callback anymore.

So remove dead code which handles -EOPNOTSUPP return value.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
Dear Lorenzo,

could you please give your Ack for this, so that Vinod can apply it
with the rest of the comphy series?
The series can be found at
  https://lore.kernel.org/linux-phy/20220203214444.1508-1-kabel@kernel.org/

Marek
---
 drivers/pci/controller/pci-aardvark.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Lorenzo Pieralisi Feb. 24, 2022, 3:37 p.m. UTC | #1 
On Thu, Feb 24, 2022 at 04:17:18PM +0100, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.
> 
> Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return
> -EOPNOTSUPP from phy_power_on() callback anymore.
> 
> So remove dead code which handles -EOPNOTSUPP return value.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <kabel@kernel.org>
> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
> Dear Lorenzo,
> 
> could you please give your Ack for this, so that Vinod can apply it
> with the rest of the comphy series?
> The series can be found at
>   https://lore.kernel.org/linux-phy/20220203214444.1508-1-kabel@kernel.org/
> 
> Marek
> ---
>  drivers/pci/controller/pci-aardvark.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

> diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
> index 4f5b44827d21..6bae688852a5 100644
> --- a/drivers/pci/controller/pci-aardvark.c
> +++ b/drivers/pci/controller/pci-aardvark.c
> @@ -1482,9 +1482,7 @@ static int advk_pcie_enable_phy(struct advk_pcie *pcie)
>  	}
>  
>  	ret = phy_power_on(pcie->phy);
> -	if (ret == -EOPNOTSUPP) {
> -		dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
> -	} else if (ret) {
> +	if (ret) {
>  		phy_exit(pcie->phy);
>  		return ret;
>  	}
> -- 
> 2.34.1
>
diff mbox series

Patch

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 4f5b44827d21..6bae688852a5 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1482,9 +1482,7 @@  static int advk_pcie_enable_phy(struct advk_pcie *pcie)
 	}
 
 	ret = phy_power_on(pcie->phy);
-	if (ret == -EOPNOTSUPP) {
-		dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
-	} else if (ret) {
+	if (ret) {
 		phy_exit(pcie->phy);
 		return ret;
 	}