diff mbox series

[U-Boot,07/10] dm: net: fec: Move enet init in fec_enet

Message ID 20180730124509.13063-8-jagan@amarulasolutions.com
State Changes Requested
Delegated to: Joe Hershberger
Headers show
Series net: fec: Code Improvement/cleanups | expand

Commit Message

Jagan Teki July 30, 2018, 12:45 p.m. UTC 
Move enet initialization code in fec_enet function,
no functional changes.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 drivers/net/fec_mxc.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

Comments

Joe Hershberger July 30, 2018, 11:21 p.m. UTC | #1 
On Mon, Jul 30, 2018 at 7:45 AM, Jagan Teki <jagan@amarulasolutions.com> wrote:
> Move enet initialization code in fec_enet function,
> no functional changes.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
diff mbox series

Patch

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 3ae62ff9d1..76a3bd84f0 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1254,11 +1254,8 @@  static int fec_phy_init(struct udevice *dev)
 	return 0;
 }
 
-static int fecmxc_probe(struct udevice *dev)
+static int fec_enet_init(struct fec_priv *priv)
 {
-	struct eth_pdata *pdata = dev_get_platdata(dev);
-	struct fec_priv *priv = dev_get_priv(dev);
-	struct mii_dev *bus = NULL;
 	uint32_t start;
 	int ret;
 
@@ -1280,6 +1277,24 @@  static int fecmxc_probe(struct udevice *dev)
 
 	fec_reg_setup(priv);
 
+	return 0;
+
+err_timeout:
+	fec_free_descs(priv);
+	return ret;
+}
+
+static int fecmxc_probe(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	struct fec_priv *priv = dev_get_priv(dev);
+	struct mii_dev *bus = NULL;
+	int ret;
+
+	ret = fec_enet_init(priv);
+	if (ret)
+		return ret;
+
 	priv->dev_id = dev->seq;
 #ifdef CONFIG_FEC_MXC_MDIO_BASE
 	bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, dev->seq);
@@ -1303,7 +1318,6 @@  err_phy:
 	mdio_unregister(bus);
 	free(bus);
 err_mii:
-err_timeout:
 	fec_free_descs(priv);
 	return ret;
 }