]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
fec: Only pass pdev in fec_ptp_init()
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 7 Jun 2013 10:48:00 +0000 (10:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2013 21:41:07 +0000 (14:41 -0700)
Passing pdev in fec_ptp_init() is enough, since we can get ndev locally.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec.h
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/freescale/fec_ptp.c

index b11cdbcc04ff5d6d518b9b5dc735d99626022554..e3ed6c5ae8012fc16253c0d682be4017033b92bb 100644 (file)
@@ -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);
 
index c42c42a0cc573745da7843557b32680476a4ae34..fa4a68fc01cb1df571502b35eae4cd228a2fd48c 100644 (file)
@@ -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)
index 25fc960cbf0e9bc2e2f9bdd9e01e6f91eb2ebffd..5007e4f9fff91705d93e875ad2c15108e915ebb3 100644 (file)
@@ -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;