From patchwork Fri Jun 7 20:48:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 249852 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 A97D52C00A9 for ; Sat, 8 Jun 2013 06:49:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757280Ab3FGUsQ (ORCPT ); Fri, 7 Jun 2013 16:48:16 -0400 Received: from mail-ye0-f176.google.com ([209.85.213.176]:43732 "EHLO mail-ye0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754898Ab3FGUsO (ORCPT ); Fri, 7 Jun 2013 16:48:14 -0400 Received: by mail-ye0-f176.google.com with SMTP id m14so1014996yen.21 for ; Fri, 07 Jun 2013 13:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=xeGw+ycxEOMgvEblV0xm0u4olFLUK0wJk1TmUOgV0rM=; b=YRqiwsd42dtrATYHDmgfc5/5v6m4BOcWqtsMZG18+QvhH3TAre+L0Yf++rvex5XJ7k sGsCEc3iIGPie8HdIgozhxHhDdFA7YobrnGmv9i20qgyngOBLgev+gyBbdExWMO5G3cg nGZTLVZ2jTVhjSHCF0kSTSvPQj/vdHgTzv4MDNWCaMPDOoV8REd2wIjiNym6Y8+zP9BK OBgDKXbcVWBaerpz828kc7dohWkBmfqCAuvhkFlZsEVL2qJy6iOtul9ahvNOSImdONEn ZxxqBx5rdJokaU6UX6kXfX1YHtFAXLgpFYlLfmiMAn1JH1vqisWr+ro/bVlJBb9wiZ3C JrKg== X-Received: by 10.236.222.41 with SMTP id s39mr250061yhp.20.1370638093764; Fri, 07 Jun 2013 13:48:13 -0700 (PDT) Received: from localhost.localdomain ([187.106.36.101]) by mx.google.com with ESMTPSA id x22sm757961yhd.2.2013.06.07.13.48.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Jun 2013 13:48:13 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: Frank.Li@freescale.com, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH] fec: Only pass pdev in fec_ptp_init() Date: Fri, 7 Jun 2013 17:48:00 -0300 Message-Id: <1370638080-19891-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam Passing pdev in fec_ptp_init() is enough, since we can get ndev locally. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec.h | 2 +- drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/freescale/fec_ptp.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index b11cdbc..e3ed6c5 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -275,7 +275,7 @@ struct fec_enet_private { struct regulator *reg_phy; }; -void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev); +void fec_ptp_init(struct platform_device *pdev); void fec_ptp_start_cyclecounter(struct net_device *ndev); int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd); diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index c42c42a..fa4a68f 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1945,7 +1945,7 @@ fec_probe(struct platform_device *pdev) fec_reset_phy(pdev); if (fep->bufdesc_ex) - fec_ptp_init(ndev, pdev); + fec_ptp_init(pdev); ret = fec_enet_init(ndev); if (ret) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 25fc960..5007e4f 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -347,8 +347,9 @@ static void fec_time_keep(unsigned long _data) * cyclecounter init routine and exits. */ -void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev) +void fec_ptp_init(struct platform_device *pdev) { + struct net_device *ndev = platform_get_drvdata(pdev); struct fec_enet_private *fep = netdev_priv(ndev); fep->ptp_caps.owner = THIS_MODULE;