Commit 4494c10e authored by Justin Chen's avatar Justin Chen Committed by Paolo Abeni

net: bcmasp: Remove phy_{suspend/resume}

phy_{suspend/resume} is redundant. It gets called from phy_{stop/start}.

Fixes: 490cb412 ("net: bcmasp: Add support for ASP2.0 Ethernet controller")
Signed-off-by: default avatarJustin Chen <justin.chen@broadcom.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent dfd222e2
...@@ -1044,10 +1044,6 @@ static int bcmasp_netif_init(struct net_device *dev, bool phy_connect) ...@@ -1044,10 +1044,6 @@ static int bcmasp_netif_init(struct net_device *dev, bool phy_connect)
/* Indicate that the MAC is responsible for PHY PM */ /* Indicate that the MAC is responsible for PHY PM */
phydev->mac_managed_pm = true; phydev->mac_managed_pm = true;
} else if (!intf->wolopts) {
ret = phy_resume(dev->phydev);
if (ret)
goto err_phy_disable;
} }
umac_reset(intf); umac_reset(intf);
...@@ -1334,7 +1330,6 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf) ...@@ -1334,7 +1330,6 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf)
{ {
struct device *kdev = &intf->parent->pdev->dev; struct device *kdev = &intf->parent->pdev->dev;
struct net_device *dev = intf->ndev; struct net_device *dev = intf->ndev;
int ret = 0;
if (!netif_running(dev)) if (!netif_running(dev))
return 0; return 0;
...@@ -1344,10 +1339,6 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf) ...@@ -1344,10 +1339,6 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf)
bcmasp_netif_deinit(dev); bcmasp_netif_deinit(dev);
if (!intf->wolopts) { if (!intf->wolopts) {
ret = phy_suspend(dev->phydev);
if (ret)
goto out;
if (intf->internal_phy) if (intf->internal_phy)
bcmasp_ephy_enable_set(intf, false); bcmasp_ephy_enable_set(intf, false);
else else
...@@ -1364,11 +1355,7 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf) ...@@ -1364,11 +1355,7 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf)
clk_disable_unprepare(intf->parent->clk); clk_disable_unprepare(intf->parent->clk);
return ret; return 0;
out:
bcmasp_netif_init(dev, false);
return ret;
} }
static void bcmasp_resume_from_wol(struct bcmasp_intf *intf) static void bcmasp_resume_from_wol(struct bcmasp_intf *intf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment