4 files changed, 1 insertions, 45 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index d463563e1f70..6ee78c203eca 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -848,8 +848,6 @@ void be_roce_dev_remove(struct be_adapter *);
 /*
  * internal function to open-close roce device during ifup-ifdown.
  */
-void be_roce_dev_open(struct be_adapter *);
-void be_roce_dev_close(struct be_adapter *);
 void be_roce_dev_shutdown(struct be_adapter *);
 
 #endif                          /* BE_H */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index b6ad02909d6b..ff2ff8946671 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3432,8 +3432,6 @@ static int be_close(struct net_device *netdev)
 
         be_disable_if_filters(adapter);
 
-        be_roce_dev_close(adapter);
-
         if (adapter->flags & BE_FLAGS_NAPI_ENABLED) {
                 for_all_evt_queues(adapter, eqo, i) {
                         napi_disable(&eqo->napi);
@@ -3601,8 +3599,6 @@ static int be_open(struct net_device *netdev)
                 be_link_status_update(adapter, link_status);
 
         netif_tx_start_all_queues(netdev);
-        be_roce_dev_open(adapter);
-
 #ifdef CONFIG_BE2NET_VXLAN
         if (skyhawk_chip(adapter))
                 vxlan_get_rx_port(netdev);
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c
index 60368207bf58..4089156a7f5e 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.c
+++ b/drivers/net/ethernet/emulex/benet/be_roce.c
@@ -116,40 +116,6 @@ void be_roce_dev_remove(struct be_adapter *adapter)
         }
 }
 
-static void _be_roce_dev_open(struct be_adapter *adapter)
-{
-        if (ocrdma_drv && adapter->ocrdma_dev &&
-            ocrdma_drv->state_change_handler)
-                ocrdma_drv->state_change_handler(adapter->ocrdma_dev,
-                                                 BE_DEV_UP);
-}
-
-void be_roce_dev_open(struct be_adapter *adapter)
-{
-        if (be_roce_supported(adapter)) {
-                mutex_lock(&be_adapter_list_lock);
-                _be_roce_dev_open(adapter);
-                mutex_unlock(&be_adapter_list_lock);
-        }
-}
-
-static void _be_roce_dev_close(struct be_adapter *adapter)
-{
-        if (ocrdma_drv && adapter->ocrdma_dev &&
-            ocrdma_drv->state_change_handler)
-                ocrdma_drv->state_change_handler(adapter->ocrdma_dev,
-                                                 BE_DEV_DOWN);
-}
-
-void be_roce_dev_close(struct be_adapter *adapter)
-{
-        if (be_roce_supported(adapter)) {
-                mutex_lock(&be_adapter_list_lock);
-                _be_roce_dev_close(adapter);
-                mutex_unlock(&be_adapter_list_lock);
-        }
-}
-
 void be_roce_dev_shutdown(struct be_adapter *adapter)
 {
         if (be_roce_supported(adapter)) {
@@ -177,8 +143,6 @@ int be_roce_register_driver(struct ocrdma_driver *drv)
 
                 _be_roce_dev_add(dev);
                 netdev = dev->netdev;
-                if (netif_running(netdev) && netif_oper_up(netdev))
-                        _be_roce_dev_open(dev);
         }
         mutex_unlock(&be_adapter_list_lock);
         return 0;
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.h b/drivers/net/ethernet/emulex/benet/be_roce.h
index cde6ef905ec4..fde609789483 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.h
+++ b/drivers/net/ethernet/emulex/benet/be_roce.h
@@ -60,9 +60,7 @@ struct ocrdma_driver {
         void (*state_change_handler) (struct ocrdma_dev *, u32 new_state);
 };
 
-enum {
-        BE_DEV_UP       = 0,
-        BE_DEV_DOWN     = 1,
+enum be_roce_event {
         BE_DEV_SHUTDOWN = 2
 };