LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: fec_mxc: use fec_set_dev_name to set name 

This allows us to create the phydev before calling
fec_probe in later patch.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
This commit is contained in:
Troy Kisky 2012-10-22 16:40:44 +00:00 committed by Stefano Babic
parent 1adb406b01
commit ef8e3a3bbf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/fec_mxc.c
View File

@ -915,6 +915,11 @@ static int fec_recv(struct eth_device *dev)
return len; 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) static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
{ {
struct eth_device *edev; 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); fec_reg_setup(fec);
if (dev_id == -1) { fec_set_dev_name(edev->name, dev_id);
sprintf(edev->name, "FEC"); fec->dev_id = (dev_id == -1) ? 0 : dev_id;
fec->dev_id = 0;
} else {
sprintf(edev->name, "FEC%i", dev_id);
fec->dev_id = dev_id;
}
fec->phy_id = phy_id; fec->phy_id = phy_id;
bus = mdio_alloc(); 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->read = fec_phy_read;
bus->write = fec_phy_write; bus->write = fec_phy_write;
sprintf(bus->name, edev->name); fec_set_dev_name(bus->name, dev_id);
#ifdef CONFIG_MX28 #ifdef CONFIG_MX28
/* /*
* The i.MX28 has two ethernet interfaces, but they are not equal. * The i.MX28 has two ethernet interfaces, but they are not equal.