diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2017-07-31 12:04:28 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-31 14:40:58 -0700 |
| commit | 6f24b85e265a29f570f83c1c3694444ca0e07a56 (patch) | |
| tree | 492f1691b1214fe2d23d550df9a8d4b4f7c2e170 /drivers/net/ethernet/broadcom/genet/bcmmii.c | |
| parent | net: bcmgenet: Drop legacy MDIO code (diff) | |
| download | linux-dev-6f24b85e265a29f570f83c1c3694444ca0e07a56.tar.xz linux-dev-6f24b85e265a29f570f83c1c3694444ca0e07a56.zip | |
net: bcmgenet: Utilize bcmgenet_mii_exit() for error path
bcmgenet_mii_init() has an error path which is strictly identical to the
unwinding that bcmgenet_mii_exit() does, so have bcmgenet_mii_init()
utilize bcmgenet_mii_exit() for that.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmmii.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmmii.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 7fdc352628f9..33d3f60ac74b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -563,7 +563,6 @@ static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv) int bcmgenet_mii_init(struct net_device *dev) { struct bcmgenet_priv *priv = netdev_priv(dev); - struct device_node *dn = priv->pdev->dev.of_node; int ret; ret = bcmgenet_mii_register(priv); @@ -577,11 +576,7 @@ int bcmgenet_mii_init(struct net_device *dev) return 0; out: - if (of_phy_is_fixed_link(dn)) - of_phy_deregister_fixed_link(dn); - of_node_put(priv->phy_dn); - platform_device_unregister(priv->mii_pdev); - platform_device_put(priv->mii_pdev); + bcmgenet_mii_exit(dev); return ret; } |