bna: remove paused from bna_rx_config and flags from bna_rxf

The bna_rx_config struct member paused can be removed as it is never
written and as it cannot have non-zero value the bna_rxf struct member
flags also cannot have BNA_RXF_F_PAUSED value and is always zero.
So the flags member can be removed as well as bna_rxf_flags enum and
the code-paths that needs to have non-zero bna_rxf->flags.
This clean-up makes bna_rxf_sm_paused state unsed and can be also removed.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c
index ccf48a1956a1206dfa54f64112d7b4ef309ecc65..896aa8287a66ec548e78f3b191f9ccd81e5ecda1 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c
+++ b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c
@@ -59,8 +59,6 @@ static int bna_rxf_allmulti_cfg_reset(struct bna_rxf *rxf,
 
 bfa_fsm_state_decl(bna_rxf, stopped, struct bna_rxf,
                        enum bna_rxf_event);
-bfa_fsm_state_decl(bna_rxf, paused, struct bna_rxf,
-                       enum bna_rxf_event);
 bfa_fsm_state_decl(bna_rxf, cfg_wait, struct bna_rxf,
                        enum bna_rxf_event);
 bfa_fsm_state_decl(bna_rxf, started, struct bna_rxf,
@@ -79,11 +77,7 @@ bna_rxf_sm_stopped(struct bna_rxf *rxf, enum bna_rxf_event event)
 {
        switch (event) {
        case RXF_E_START:
-               if (rxf->flags & BNA_RXF_F_PAUSED) {
-                       bfa_fsm_set_state(rxf, bna_rxf_sm_paused);
-                       call_rxf_start_cbfn(rxf);
-               } else
-                       bfa_fsm_set_state(rxf, bna_rxf_sm_cfg_wait);
+               bfa_fsm_set_state(rxf, bna_rxf_sm_cfg_wait);
                break;
 
        case RXF_E_STOP:
@@ -103,29 +97,6 @@ bna_rxf_sm_stopped(struct bna_rxf *rxf, enum bna_rxf_event event)
        }
 }
 
-static void
-bna_rxf_sm_paused_entry(struct bna_rxf *rxf)
-{
-}
-
-static void
-bna_rxf_sm_paused(struct bna_rxf *rxf, enum bna_rxf_event event)
-{
-       switch (event) {
-       case RXF_E_STOP:
-       case RXF_E_FAIL:
-               bfa_fsm_set_state(rxf, bna_rxf_sm_stopped);
-               break;
-
-       case RXF_E_CONFIG:
-               call_rxf_cam_fltr_cbfn(rxf);
-               break;
-
-       default:
-               bfa_sm_fault(event);
-       }
-}
-
 static void
 bna_rxf_sm_cfg_wait_entry(struct bna_rxf *rxf)
 {
@@ -679,9 +650,6 @@ bna_rxf_init(struct bna_rxf *rxf,
        INIT_LIST_HEAD(&rxf->mcast_active_q);
        INIT_LIST_HEAD(&rxf->mcast_handle_q);
 
-       if (q_config->paused)
-               rxf->flags |= BNA_RXF_F_PAUSED;
-
        rxf->rit = (u8 *)
                res_info[BNA_RX_RES_MEM_T_RIT].res_u.mem_info.mdl[0].kva;
        bna_rit_init(rxf, q_config->num_paths);
@@ -742,8 +710,6 @@ bna_rxf_uninit(struct bna_rxf *rxf)
        rxf->rss_pending = 0;
        rxf->vlan_strip_pending = false;
 
-       rxf->flags = 0;
-
        rxf->rx = NULL;
 }
 

diff --git a/drivers/net/ethernet/brocade/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h
index e56f6503e37d63eeb23addb3d89e5c0d948c303d..134abf7f768198a2194787891c2a3f17ca6497e0 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bna_types.h
+++ b/drivers/net/ethernet/brocade/bna/bna_types.h
@@ -182,10 +182,6 @@ enum bna_rx_mod_flags {
        BNA_RX_MOD_F_ENET_LOOPBACK      = 2,
 };
 
-enum bna_rxf_flags {
-       BNA_RXF_F_PAUSED                = 1,
-};
-
 enum bna_rxf_event {
        RXF_E_START                     = 1,
        RXF_E_STOP                      = 2,
@@ -668,7 +664,6 @@ struct bna_rx_config {
        enum bna_rx_type rx_type;
        int                     num_paths;
        enum bna_rxp_type rxp_type;
-       int                     paused;
        int                     coalescing_timeo;
        /*
         * Small/Large (or Header/Data) buffer size to be configured
@@ -713,7 +708,6 @@ struct bna_rxp {
 /* RxF structure (hardware Rx Function) */
 struct bna_rxf {
        bfa_fsm_t               fsm;
-       enum bna_rxf_flags flags;
 
        struct bfa_msgq_cmd_entry msgq_cmd;
        union {