diff options
| author | Pali Rohár <pali@kernel.org> | 2022-02-03 22:44:42 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-02-25 19:12:21 +0530 |
| commit | ee995101fde67f85a3cd4c74f4f92fc4592e726b (patch) | |
| tree | 70215de4b514400f5785667d1b0eecc8b1719814 /drivers/ata/libahci_platform.c | |
| parent | 934337080c6c59b75db76b180b509f218640ad48 (diff) | |
| download | linux-ee995101fde67f85a3cd4c74f4f92fc4592e726b.tar.bz2 | |
Revert "ata: ahci: mvebu: Make SATA PHY optional for Armada 3720"
This reverts commit 45aefe3d2251e4e229d7662052739f96ad1d08d9.
Armada 3720 PHY driver (phy-mvebu-a3700-comphy.c) does not return
-EOPNOTSUPP from phy_power_on() callback anymore.
So remove AHCI_HFLAG_IGN_NOTSUPP_POWER_ON flag from Armada 3720 plat data.
AHCI_HFLAG_IGN_NOTSUPP_POWER_ON is not used by any other ahci driver, so
remove this flag completely.
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>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Link: https://lore.kernel.org/r/20220203214444.1508-4-kabel@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/ata/libahci_platform.c')
| -rw-r--r-- | drivers/ata/libahci_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 18296443ccba..b26755bdc9d6 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -59,7 +59,7 @@ int ahci_platform_enable_phys(struct ahci_host_priv *hpriv) } rc = phy_power_on(hpriv->phys[i]); - if (rc && !(rc == -EOPNOTSUPP && (hpriv->flags & AHCI_HFLAG_IGN_NOTSUPP_POWER_ON))) { + if (rc) { phy_exit(hpriv->phys[i]); goto disable_phys; } |