]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
net: fec_mxc: have fecmxc_initialize call fecmxc_initialize_multi
authorTroy Kisky <troy.kisky@boundarydevices.com>
Mon, 22 Oct 2012 16:40:42 +0000 (16:40 +0000)
committerStefano Babic <sbabic@denx.de>
Mon, 28 Jan 2013 05:57:50 +0000 (06:57 +0100)
Having only one call to fec_probe will ease the changing of its
parameters.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
drivers/net/fec_mxc.c

index eb89e573cbe1340eb9caf0b23e68ce9772142aa6..f7384ad708717ed6e5f3223bd37992c0598f808b 100644 (file)
@@ -1021,27 +1021,19 @@ err1:
        return ret;
 }
 
-#ifdef CONFIG_FEC_MXC_PHYADDR
-int fecmxc_initialize(bd_t *bd)
-{
-       int lout = 1;
-
-       debug("eth_init: fec_probe(bd)\n");
-       lout = fec_probe(bd, -1, CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-
-       return lout;
-}
-#endif
-
 int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr)
 {
-       int lout = 1;
-
        debug("eth_init: fec_probe(bd, %i, %i) @ %08x\n", dev_id, phy_id, addr);
-       lout = fec_probe(bd, dev_id, phy_id, addr);
+       return fec_probe(bd, dev_id, phy_id, addr);
+}
 
-       return lout;
+#ifdef CONFIG_FEC_MXC_PHYADDR
+int fecmxc_initialize(bd_t *bd)
+{
+       return fecmxc_initialize_multi(bd, -1, CONFIG_FEC_MXC_PHYADDR,
+                       IMX_FEC_BASE);
 }
+#endif
 
 #ifndef CONFIG_PHYLIB
 int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int))