fec: Fix PHC device log
authorFabio Estevam <fabio.estevam@freescale.com>
Sat, 13 Apr 2013 07:25:36 +0000 (07:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Apr 2013 20:51:07 +0000 (16:51 -0400)
Currently when booting a mx6 device we get the following on boot:

registered PHC device on eth%d

Fix it by printing the network device name only after it gets registered, so
that the following can be read now:

fec 2188000.ethernet eth0: registered PHC device 0

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

index befdf78b3f695c77f30b4e4eaf2ca3d9c850d803..153437b32358b5288fe3d1b1c1c7dde7dbca4f0f 100644 (file)
@@ -1858,6 +1858,9 @@ fec_probe(struct platform_device *pdev)
        if (ret)
                goto failed_register;
 
+       if (fep->bufdesc_ex && fep->ptp_clock)
+               netdev_info(ndev, "registered PHC device %d\n", fep->dev_id);
+
        return 0;
 
 failed_register:
index 1f17ca0f22019d8350af2affdcc6b00739ce966f..e040c8b2733a415d5ddcd5682aba291ba77b9d3f 100644 (file)
@@ -379,7 +379,5 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev)
        if (IS_ERR(fep->ptp_clock)) {
                fep->ptp_clock = NULL;
                pr_err("ptp_clock_register failed\n");
-       } else {
-               pr_info("registered PHC device on %s\n", ndev->name);
        }
 }