staging: octeon-ethernet: drop poll_now parameter from cvm_oct_common_open

Drop redundant poll_now parameter from cvm_oct_common_open.

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-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
index 98ad4cdb05bc3e51ffce502bd5028e0c2721fe9c..613344b886e1687dff3bd2ba4ebe6a1ca32eae5e 100644 (file)
--- a/drivers/staging/octeon/ethernet-rgmii.c
+++ b/drivers/staging/octeon/ethernet-rgmii.c
@@ -207,7 +207,7 @@ static irqreturn_t cvm_oct_rgmii_rml_interrupt(int cpl, void *dev_id)
 
 int cvm_oct_rgmii_open(struct net_device *dev)
 {
-       return cvm_oct_common_open(dev, cvm_oct_rgmii_poll, true);
+       return cvm_oct_common_open(dev, cvm_oct_rgmii_poll);
 }
 
 static void cvm_oct_rgmii_immediate_poll(struct work_struct *work)

diff --git a/drivers/staging/octeon/ethernet-sgmii.c b/drivers/staging/octeon/ethernet-sgmii.c
index 8bceb769166cd04cb057d97ece527e8648e1d92a..7424dc45ad39fd7e94c482fe84edca7de7b480a9 100644 (file)
--- a/drivers/staging/octeon/ethernet-sgmii.c
+++ b/drivers/staging/octeon/ethernet-sgmii.c
@@ -27,7 +27,7 @@
 
 int cvm_oct_sgmii_open(struct net_device *dev)
 {
-       return cvm_oct_common_open(dev, cvm_oct_link_poll, true);
+       return cvm_oct_common_open(dev, cvm_oct_link_poll);
 }
 
 int cvm_oct_sgmii_init(struct net_device *dev)

diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c
index c26d1e666cd7f8c043d853b522651b2e06e7c8d5..1b9c5f9f1e94f585dd65e5eaf61a9605464eccf4 100644 (file)
--- a/drivers/staging/octeon/ethernet-xaui.c
+++ b/drivers/staging/octeon/ethernet-xaui.c
@@ -27,5 +27,5 @@
 
 int cvm_oct_xaui_open(struct net_device *dev)
 {
-       return cvm_oct_common_open(dev, cvm_oct_link_poll, true);
+       return cvm_oct_common_open(dev, cvm_oct_link_poll);
 }

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index d6f8a10a60b305cf99b1e488a2a4a217b2d85b94..44142cffbfe5e657d8cc7e9a4878f8e00ee4b6c0 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -481,7 +481,7 @@ void cvm_oct_common_uninit(struct net_device *dev)
 }
 
 int cvm_oct_common_open(struct net_device *dev,
-                       void (*link_poll)(struct net_device *), bool poll_now)
+                       void (*link_poll)(struct net_device *))
 {
        union cvmx_gmxx_prtx_cfg gmx_cfg;
        struct octeon_ethernet *priv = netdev_priv(dev);
@@ -512,8 +512,7 @@ int cvm_oct_common_open(struct net_device *dev,
                if (!link_info.s.link_up)
                        netif_carrier_off(dev);
                priv->poll = link_poll;
-               if (poll_now)
-                       link_poll(dev);
+               link_poll(dev);
        }
 
        return 0;

diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index dfb808f4ee5cb45174ff25e880745c0565fde720..50bb42fdcaaf5af3ada38e8c1238fe6b5e1d5236 100644 (file)
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -69,7 +69,7 @@ void cvm_oct_common_uninit(struct net_device *dev);
 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 (*link_poll)(struct net_device *));
 void cvm_oct_note_carrier(struct octeon_ethernet *priv,
                          cvmx_helper_link_info_t li);
 void cvm_oct_link_poll(struct net_device *dev);