From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, opendmb@gmail.com, jaedon.shin@gmail.com,
pgynther@google.com, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 7/7] net: bcmgenet: Utilize bcmgenet_mii_exit() for error path
Date: Mon, 31 Jul 2017 12:04:28 -0700 [thread overview]
Message-ID: <20170731190429.24204-8-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170731190429.24204-1-f.fainelli@gmail.com>
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>
---
drivers/net/ethernet/broadcom/genet/bcmmii.c | 7 +------
1 file changed, 1 insertion(+), 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;
}
--
2.9.3
next prev parent reply other threads:[~2017-07-31 19:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-31 19:04 [PATCH net-next 0/7] net: bcmgenet: utilize MDIO unimac driver Florian Fainelli
2017-07-31 19:04 ` [PATCH net-next 1/7] net: phy: mdio-bcm-unimac: factor busy polling loop Florian Fainelli
2017-08-01 0:28 ` kbuild test robot
2017-08-01 0:33 ` Florian Fainelli
2017-07-31 19:04 ` [PATCH net-next 2/7] net: phy: mdio-bcm-unimac: create unique bus names Florian Fainelli
2017-07-31 19:04 ` [PATCH net-next 3/7] net: phy: mdio-bcm-unimac: Add debug print for PHY workaround Florian Fainelli
2017-07-31 19:04 ` [PATCH net-next 4/7] net: phy: mdio-bcm-unimac: Allow specifying platform data Florian Fainelli
2017-07-31 19:04 ` [PATCH net-next 5/7] net: bcmgenet: utilize generic Broadcom UniMAC MDIO controller driver Florian Fainelli
2017-07-31 19:04 ` [PATCH net-next 6/7] net: bcmgenet: Drop legacy MDIO code Florian Fainelli
2017-07-31 19:04 ` Florian Fainelli [this message]
2017-07-31 21:41 ` [PATCH net-next 0/7] net: bcmgenet: utilize MDIO unimac driver David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170731190429.24204-8-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=jaedon.shin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=opendmb@gmail.com \
--cc=pgynther@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).