From patchwork Thu Jan 6 07:13:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 77687 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 39242B70E0 for ; Thu, 6 Jan 2011 18:11:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754101Ab1AFHLn (ORCPT ); Thu, 6 Jan 2011 02:11:43 -0500 Received: from am1ehsobe005.messaging.microsoft.com ([213.199.154.208]:26722 "EHLO AM1EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753972Ab1AFHLk (ORCPT ); Thu, 6 Jan 2011 02:11:40 -0500 Received: from mail16-am1-R.bigfish.com (10.3.201.245) by AM1EHSOBE005.bigfish.com (10.3.204.25) with Microsoft SMTP Server id 14.1.225.8; Thu, 6 Jan 2011 07:11:39 +0000 Received: from mail16-am1 (localhost.localdomain [127.0.0.1]) by mail16-am1-R.bigfish.com (Postfix) with ESMTP id 75E1F640190; Thu, 6 Jan 2011 07:11:39 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzbb2cK853kzz1202hzz8275bhz2dh2a8h668h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail16-am1 (localhost.localdomain [127.0.0.1]) by mail16-am1 (MessageSwitch) id 1294297899265684_13229; Thu, 6 Jan 2011 07:11:39 +0000 (UTC) Received: from AM1EHSMHS009.bigfish.com (unknown [10.3.201.246]) by mail16-am1.bigfish.com (Postfix) with ESMTP id 32C67B48050; Thu, 6 Jan 2011 07:11:39 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by AM1EHSMHS009.bigfish.com (10.3.207.109) with Microsoft SMTP Server (TLS) id 14.1.225.8; Thu, 6 Jan 2011 07:11:38 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p067Ba7p029803; Thu, 6 Jan 2011 00:11:36 -0700 (MST) Received: from ubuntu.ap.freescale.net (ubuntu-010192242196.ap.freescale.net [10.192.242.196]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p067BL5r014249; Thu, 6 Jan 2011 01:11:31 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , , , , Subject: [PATCH v4 02/10] net/fec: remove the use of "index" which is legacy Date: Thu, 6 Jan 2011 15:13:10 +0800 Message-ID: <1294297998-26930-3-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com> References: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/fec.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 52e9ca8..47f6b3b 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -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; @@ -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 @@ -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; @@ -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; @@ -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;