staging: octeon-ethernet: consolidate carrier notifications

Always use cvm_oct_note_carrier() to avoid copy-pasted code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 604fb581f1c314a13dbd6b81beaf899cee8e043f..6322d0dd4238d79ae0dfdb5f969244b2e30baa0e 100644 (file)
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -39,7 +39,6 @@
 #include "ethernet-mdio.h"
 #include "ethernet-util.h"
 
-#include <asm/octeon/cvmx-helper-board.h>
 #include <asm/octeon/cvmx-gmxx-defs.h>
 #include <asm/octeon/cvmx-smix-defs.h>
 
@@ -116,8 +115,8 @@ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        return phy_mii_ioctl(priv->phydev, rq, cmd);
 }
 
-static void cvm_oct_note_carrier(struct octeon_ethernet *priv,
-                                cvmx_helper_link_info_t li)
+void cvm_oct_note_carrier(struct octeon_ethernet *priv,
+                         cvmx_helper_link_info_t li)
 {
        if (li.s.link_up) {
                pr_notice_ratelimited("%s: %u Mbps %s duplex, port %d, queue %d\n",

diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
index a6b853118bc53d5ba49e4879f60bac9c0837e4bc..65edfbf251c495de2aafe9417fbb91a3f796bdca 100644 (file)
--- a/drivers/staging/octeon/ethernet-rgmii.c
+++ b/drivers/staging/octeon/ethernet-rgmii.c
@@ -176,23 +176,10 @@ static void cvm_oct_rgmii_poll(struct net_device *dev)
                if (link_info.s.link_up) {
                        if (!netif_carrier_ok(dev))
                                netif_carrier_on(dev);
-                       if (priv->queue != -1)
-                               printk_ratelimited("%s: %u Mbps %s duplex, port %2d, queue %2d\n",
-                                                  dev->name, link_info.s.speed,
-                                                  (link_info.s.full_duplex) ?
-                                                  "Full" : "Half",
-                                                  priv->port, priv->queue);
-                       else
-                               printk_ratelimited("%s: %u Mbps %s duplex, port %2d, POW\n",
-                                                  dev->name, link_info.s.speed,
-                                                  (link_info.s.full_duplex) ?
-                                                  "Full" : "Half",
-                                                  priv->port);
-               } else {
-                       if (netif_carrier_ok(dev))
-                               netif_carrier_off(dev);
-                       printk_ratelimited("%s: Link down\n", dev->name);
+               } else if (netif_carrier_ok(dev)) {
+                       netif_carrier_off(dev);
                }
+               cvm_oct_note_carrier(priv, link_info);
        }
 }
 

diff --git a/drivers/staging/octeon/ethernet-sgmii.c b/drivers/staging/octeon/ethernet-sgmii.c
index 1158eacc57bbfa9f6d404214d651de394efa718e..9a747f94d48c2ae6e4d51271e63d03767deab343 100644 (file)
--- a/drivers/staging/octeon/ethernet-sgmii.c
+++ b/drivers/staging/octeon/ethernet-sgmii.c
@@ -55,26 +55,12 @@ static void cvm_oct_sgmii_poll(struct net_device *dev)
 
        /* Tell Linux */
        if (link_info.s.link_up) {
-
                if (!netif_carrier_ok(dev))
                        netif_carrier_on(dev);
-               if (priv->queue != -1)
-                       printk_ratelimited
-                           ("%s: %u Mbps %s duplex, port %2d, queue %2d\n",
-                            dev->name, link_info.s.speed,
-                            (link_info.s.full_duplex) ? "Full" : "Half",
-                            priv->port, priv->queue);
-               else
-                       printk_ratelimited
-                               ("%s: %u Mbps %s duplex, port %2d, POW\n",
-                                dev->name, link_info.s.speed,
-                                (link_info.s.full_duplex) ? "Full" : "Half",
-                                priv->port);
-       } else {
-               if (netif_carrier_ok(dev))
-                       netif_carrier_off(dev);
-               printk_ratelimited("%s: Link down\n", dev->name);
+       } else if (netif_carrier_ok(dev)) {
+               netif_carrier_off(dev);
        }
+       cvm_oct_note_carrier(priv, link_info);
 }
 
 int cvm_oct_sgmii_open(struct net_device *dev)

diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c
index 3714fae201d4940d485f11f56a379ac767039bc8..888b70b93a7b3d02e11ec80cb23a4865f2e0caf8 100644 (file)
--- a/drivers/staging/octeon/ethernet-xaui.c
+++ b/drivers/staging/octeon/ethernet-xaui.c
@@ -55,26 +55,12 @@ static void cvm_oct_xaui_poll(struct net_device *dev)
 
        /* Tell Linux */
        if (link_info.s.link_up) {
-
                if (!netif_carrier_ok(dev))
                        netif_carrier_on(dev);
-               if (priv->queue != -1)
-                       printk_ratelimited
-                               ("%s: %u Mbps %s duplex, port %2d, queue %2d\n",
-                                dev->name, link_info.s.speed,
-                                (link_info.s.full_duplex) ? "Full" : "Half",
-                                priv->port, priv->queue);
-               else
-                       printk_ratelimited
-                               ("%s: %u Mbps %s duplex, port %2d, POW\n",
-                                dev->name, link_info.s.speed,
-                                (link_info.s.full_duplex) ? "Full" : "Half",
-                                priv->port);
-       } else {
-               if (netif_carrier_ok(dev))
-                       netif_carrier_off(dev);
-               printk_ratelimited("%s: Link down\n", dev->name);
+       } else if (netif_carrier_ok(dev)) {
+               netif_carrier_off(dev);
        }
+       cvm_oct_note_carrier(priv, link_info);
 }
 
 int cvm_oct_xaui_open(struct net_device *dev)

diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index 3ad713fb4725f17662eca96b10f091b565cde3ef..1e77f1d23c7410fbc700712e2513364329a99bd0 100644 (file)
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -33,6 +33,8 @@
 
 #include <linux/of.h>
 
+#include <asm/octeon/cvmx-helper-board.h>
+
 /**
  * This is the definition of the Ethernet driver's private
  * driver state stored in netdev_priv(dev).
@@ -86,6 +88,8 @@ void cvm_oct_adjust_link(struct net_device *dev);
 int cvm_oct_common_stop(struct net_device *dev);
 int cvm_oct_common_open(struct net_device *dev,
                        void (*link_poll)(struct net_device *), bool poll_now);
+void cvm_oct_note_carrier(struct octeon_ethernet *priv,
+                         cvmx_helper_link_info_t li);
 
 extern int always_use_pow;
 extern int pow_send_group;