diff options
author | Divy Le Ray <divy@chelsio.com> | 2008-10-08 20:38:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-08 20:38:01 -0400 |
commit | 78e4689e908adc8334272756c32c9218d1967408 (patch) | |
tree | 7fdc979df5345b3b45ab2d5c46467ad3415800c1 /drivers/net/cxgb3/t3_hw.c | |
parent | 8c26376112fb4b8dfea42069b602c03d53366052 (diff) |
cxgb3: allow for PHY reset status
First step towards overall PHY layering re-organization.
Allow a status return when a PHY is reset.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/t3_hw.c')
-rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 33470c79ac1c..fa0a4b4fb5cb 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
@@ -3626,8 +3626,11 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, | |||
3626 | ++j; | 3626 | ++j; |
3627 | 3627 | ||
3628 | p->port_type = &port_types[adapter->params.vpd.port_type[j]]; | 3628 | p->port_type = &port_types[adapter->params.vpd.port_type[j]]; |
3629 | p->port_type->phy_prep(&p->phy, adapter, ai->phy_base_addr + j, | 3629 | ret = p->port_type->phy_prep(&p->phy, adapter, |
3630 | ai->mdio_ops); | 3630 | ai->phy_base_addr + j, |
3631 | ai->mdio_ops); | ||
3632 | if (ret) | ||
3633 | return ret; | ||
3631 | mac_prep(&p->mac, adapter, j); | 3634 | mac_prep(&p->mac, adapter, j); |
3632 | ++j; | 3635 | ++j; |
3633 | 3636 | ||
@@ -3674,9 +3677,11 @@ int t3_replay_prep_adapter(struct adapter *adapter) | |||
3674 | while (!adapter->params.vpd.port_type[j]) | 3677 | while (!adapter->params.vpd.port_type[j]) |
3675 | ++j; | 3678 | ++j; |
3676 | 3679 | ||
3677 | p->port_type->phy_prep(&p->phy, adapter, ai->phy_base_addr + j, | 3680 | ret = p->port_type->phy_prep(&p->phy, adapter, |
3678 | ai->mdio_ops); | 3681 | ai->phy_base_addr + j, |
3679 | 3682 | ai->mdio_ops); | |
3683 | if (ret) | ||
3684 | return ret; | ||
3680 | p->phy.ops->power_down(&p->phy, 1); | 3685 | p->phy.ops->power_down(&p->phy, 1); |
3681 | ++j; | 3686 | ++j; |
3682 | } | 3687 | } |