Skip to content

Commit

Permalink
net/fec: remove the use of "index" which is legacy
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shawn Guo authored and David S. Miller committed Jan 9, 2011
1 parent 862f098 commit 8649a23
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/net/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ struct fec_enet_private {
int mii_timeout;
uint phy_speed;
phy_interface_t phy_interface;
int index;
int link;
int full_duplex;
struct completion mdio_done;
Expand Down Expand Up @@ -566,7 +565,7 @@ static void __inline__ fec_get_mac(struct net_device *dev)

/* 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;
dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->pdev->id;
}
#endif

Expand Down Expand Up @@ -1067,9 +1066,8 @@ static const struct net_device_ops fec_netdev_ops = {
/*
* 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 bufdesc *cbd_base;
Expand All @@ -1086,7 +1084,6 @@ static int fec_enet_init(struct net_device *dev, int index)

spin_lock_init(&fep->hw_lock);

fep->index = index;
fep->hwp = (void __iomem *)dev->base_addr;
fep->netdev = dev;

Expand Down Expand Up @@ -1316,7 +1313,7 @@ fec_probe(struct platform_device *pdev)
}
clk_enable(fep->clk);

ret = fec_enet_init(ndev, 0);
ret = fec_enet_init(ndev);
if (ret)
goto failed_init;

Expand Down

0 comments on commit 8649a23

Please sign in to comment.