4 files changed, 12 insertions, 16 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index 4ec7397e7fb3..a1b17cd7886b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -347,10 +347,9 @@ static void dwmac4_display_ring(void *head, unsigned int size, bool rx)
         pr_info("%s descriptor ring:\n", rx ? "RX" : "TX");
 
         for (i = 0; i < size; i++) {
-                if (p->des0)
-                        pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
-                                i, (unsigned int)virt_to_phys(p),
-                                p->des0, p->des1, p->des2, p->des3);
+                pr_info("%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
+                        i, (unsigned int)virt_to_phys(p),
+                        p->des0, p->des1, p->des2, p->des3);
                 p++;
         }
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 8dc9056c1001..b15fc55f1b96 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -145,7 +145,7 @@ int stmmac_mdio_register(struct net_device *ndev);
 int stmmac_mdio_reset(struct mii_bus *mii);
 void stmmac_set_ethtool_ops(struct net_device *netdev);
 
-int stmmac_ptp_register(struct stmmac_priv *priv);
+void stmmac_ptp_register(struct stmmac_priv *priv);
 void stmmac_ptp_unregister(struct stmmac_priv *priv);
 int stmmac_resume(struct device *dev);
 int stmmac_suspend(struct device *dev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 6c85b61aaa0b..48e71fad4210 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -676,7 +676,9 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)
         priv->hwts_tx_en = 0;
         priv->hwts_rx_en = 0;
 
-        return stmmac_ptp_register(priv);
+        stmmac_ptp_register(priv);
+
+        return 0;
 }
 
 static void stmmac_release_ptp(struct stmmac_priv *priv)
@@ -1710,7 +1712,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
         if (init_ptp) {
                 ret = stmmac_init_ptp(priv);
                 if (ret)
-                        netdev_warn(priv->dev, "PTP support cannot init.\n");
+                        netdev_warn(priv->dev, "fail to init PTP.\n");
         }
 
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index 289d52725a6c..1477471f8d44 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -177,7 +177,7 @@ static struct ptp_clock_info stmmac_ptp_clock_ops = {
  * Description: this function will register the ptp clock driver
  * to kernel. It also does some house keeping work.
  */
-int stmmac_ptp_register(struct stmmac_priv *priv)
+void stmmac_ptp_register(struct stmmac_priv *priv)
 {
         spin_lock_init(&priv->ptp_lock);
         priv->ptp_clock_ops = stmmac_ptp_clock_ops;
@@ -185,15 +185,10 @@ int stmmac_ptp_register(struct stmmac_priv *priv)
         priv->ptp_clock = ptp_clock_register(&priv->ptp_clock_ops,
                                              priv->device);
         if (IS_ERR(priv->ptp_clock)) {
+                netdev_err(priv->dev, "ptp_clock_register failed\n");
                 priv->ptp_clock = NULL;
-                return PTR_ERR(priv->ptp_clock);
-        }
-
-        spin_lock_init(&priv->ptp_lock);
-
-        netdev_dbg(priv->dev, "Added PTP HW clock successfully\n");
-
-        return 0;
+        } else if (priv->ptp_clock)
+                netdev_info(priv->dev, "registered PTP clock\n");
 }
 
 /**