renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 23:53:55 +08:00
Code

net/fec: remove the use of "index" which is legacy

Browse Source 
The "index" becomes legacy since fep->pdev->id starts working
to identify the instance.

Moreover, the call of fec_enet_init(ndev, 0) always passes 0
to fep->index. This makes the following code in fec_get_mac buggy.

	/* Adjust MAC if using default MAC address */
	if (iap == fec_mac_default)
		dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;

It may be the time to remove "index" and use fep->pdev->id instead.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shawn Guo 2011-01-05 21:13:10 +00:00 committed by David S. Miller
parent 862f0982ea
commit 8649a230e3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/fec.c
View File

@ -186,7 +186,6 @@ struct fec_enet_private {
int mii_timeout; int mii_timeout;
uint phy_speed; uint phy_speed;
phy_interface_t phy_interface; phy_interface_t phy_interface;
int index;
int link; int link;
int full_duplex; int full_duplex;
struct completion mdio_done; struct completion mdio_done;
@ -566,7 +565,7 @@ static void __inline__ fec_get_mac(struct net_device *dev)
/* Adjust MAC if using default MAC address */ /* Adjust MAC if using default MAC address */
if (iap == fec_mac_default) if (iap == fec_mac_default)
dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->pdev->id;
} }
#endif #endif
@ -1067,9 +1066,8 @@ static const struct net_device_ops fec_netdev_ops = {
/* /*
* XXX: We need to clean up on failure exits here. * XXX: We need to clean up on failure exits here.
* *
* index is only used in legacy code
*/ */
static int fec_enet_init(struct net_device *dev, int index) static int fec_enet_init(struct net_device *dev)
{ {
struct fec_enet_private *fep = netdev_priv(dev); struct fec_enet_private *fep = netdev_priv(dev);
struct bufdesc *cbd_base; struct bufdesc *cbd_base;
@ -1086,7 +1084,6 @@ static int fec_enet_init(struct net_device *dev, int index)
spin_lock_init(&fep->hw_lock); spin_lock_init(&fep->hw_lock);
fep->index = index;
fep->hwp = (void __iomem *)dev->base_addr; fep->hwp = (void __iomem *)dev->base_addr;
fep->netdev = dev; fep->netdev = dev;
@ -1316,7 +1313,7 @@ fec_probe(struct platform_device *pdev)
} }
clk_enable(fep->clk); clk_enable(fep->clk);
ret = fec_enet_init(ndev, 0); ret = fec_enet_init(ndev);
if (ret) if (ret)
goto failed_init; goto failed_init;