net: fec_mxc: use fec_set_dev_name to set name
authorTroy Kisky <troy.kisky@boundarydevices.com>
Mon, 22 Oct 2012 16:40:44 +0000 (16:40 +0000)
committerStefano Babic <sbabic@denx.de>
Mon, 28 Jan 2013 05:57:50 +0000 (06:57 +0100)
This allows us to create the phydev before calling
fec_probe in later patch.

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

index f7384ad..7e27210 100644 (file)
@@ -915,6 +915,11 @@ static int fec_recv(struct eth_device *dev)
        return len;
 }
 
+static void fec_set_dev_name(char *dest, int dev_id)
+{
+       sprintf(dest, (dev_id == -1) ? "FEC" : "FEC%i", dev_id);
+}
+
 static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
 {
        struct eth_device *edev;
@@ -967,13 +972,8 @@ static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
 
        fec_reg_setup(fec);
 
-       if (dev_id == -1) {
-               sprintf(edev->name, "FEC");
-               fec->dev_id = 0;
-       } else {
-               sprintf(edev->name, "FEC%i", dev_id);
-               fec->dev_id = dev_id;
-       }
+       fec_set_dev_name(edev->name, dev_id);
+       fec->dev_id = (dev_id == -1) ? 0 : dev_id;
        fec->phy_id = phy_id;
 
        bus = mdio_alloc();
@@ -984,7 +984,7 @@ static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
        }
        bus->read = fec_phy_read;
        bus->write = fec_phy_write;
-       sprintf(bus->name, edev->name);
+       fec_set_dev_name(bus->name, dev_id);
 #ifdef CONFIG_MX28
        /*
         * The i.MX28 has two ethernet interfaces, but they are not equal.