bna: remove pause_cbfn from struct bna_enet

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
index b8de17b0d47aa84cf2cd80e89704deda2a333c83..dc9f73b5510e5b0a7149c61d128f53f4590b5d66 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
@@ -884,16 +884,6 @@ do {                                                                       \
        }                                                               \
 } while (0)
 
-#define call_enet_pause_cbfn(enet)                                     \
-do {                                                                   \
-       if ((enet)->pause_cbfn) {                                       \
-               void (*cbfn)(struct bnad *);                            \
-               cbfn = (enet)->pause_cbfn;                              \
-               (enet)->pause_cbfn = NULL;                              \
-               cbfn((enet)->bna->bnad);                                \
-       }                                                               \
-} while (0)
-
 #define call_enet_mtu_cbfn(enet)                                       \
 do {                                                                   \
        if ((enet)->mtu_cbfn) {                                         \
@@ -925,7 +915,6 @@ bfa_fsm_state_decl(bna_enet, chld_stop_wait, struct bna_enet,
 static void
 bna_enet_sm_stopped_entry(struct bna_enet *enet)
 {
-       call_enet_pause_cbfn(enet);
        call_enet_mtu_cbfn(enet);
        call_enet_stop_cbfn(enet);
 }
@@ -947,7 +936,6 @@ bna_enet_sm_stopped(struct bna_enet *enet, enum bna_enet_event event)
                break;
 
        case ENET_E_PAUSE_CFG:
-               call_enet_pause_cbfn(enet);
                break;
 
        case ENET_E_MTU_CFG:
@@ -1039,7 +1027,6 @@ bna_enet_sm_started_entry(struct bna_enet *enet)
         * NOTE: Do not call bna_enet_chld_start() here, since it will be
         * inadvertently called during cfg_wait->started transition as well
         */
-       call_enet_pause_cbfn(enet);
        call_enet_mtu_cbfn(enet);
 }
 
@@ -1211,8 +1198,6 @@ bna_enet_init(struct bna_enet *enet, struct bna *bna)
        enet->stop_cbfn = NULL;
        enet->stop_cbarg = NULL;
 
-       enet->pause_cbfn = NULL;
-
        enet->mtu_cbfn = NULL;
 
        bfa_fsm_set_state(enet, bna_enet_sm_stopped);

diff --git a/drivers/net/ethernet/brocade/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h
index d0a7a566f5d656a58febc0cdbfdf0fc8ffd92e1c..a50ee997dd45f3e412aa0871e1716d1fc7c12f29 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bna_types.h
+++ b/drivers/net/ethernet/brocade/bna/bna_types.h
@@ -362,9 +362,6 @@ struct bna_enet {
        void (*stop_cbfn)(void *);
        void                    *stop_cbarg;
 
-       /* Callback for bna_enet_pause_config() */
-       void (*pause_cbfn)(struct bnad *);
-
        /* Callback for bna_enet_mtu_set() */
        void (*mtu_cbfn)(struct bnad *);