UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ivan Vecera 2015-06-11 15:52:19 +02:00 committed by David S. Miller
parent 1f9883e032
commit ef5b67c133
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/brocade/bna/bna_enet.c
View File

@ -884,16 +884,6 @@ do { \
} \ } \
} while (0) } 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) \ #define call_enet_mtu_cbfn(enet) \
do { \ do { \
if ((enet)->mtu_cbfn) { \ if ((enet)->mtu_cbfn) { \
@ -925,7 +915,6 @@ bfa_fsm_state_decl(bna_enet, chld_stop_wait, struct bna_enet,
static void static void
bna_enet_sm_stopped_entry(struct bna_enet *enet) bna_enet_sm_stopped_entry(struct bna_enet *enet)
{ {
call_enet_pause_cbfn(enet);
call_enet_mtu_cbfn(enet); call_enet_mtu_cbfn(enet);
call_enet_stop_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; break;
case ENET_E_PAUSE_CFG: case ENET_E_PAUSE_CFG:
call_enet_pause_cbfn(enet);
break; break;
case ENET_E_MTU_CFG: 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 * NOTE: Do not call bna_enet_chld_start() here, since it will be
* inadvertently called during cfg_wait->started transition as well * inadvertently called during cfg_wait->started transition as well
*/ */
call_enet_pause_cbfn(enet);
call_enet_mtu_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_cbfn = NULL;
enet->stop_cbarg = NULL; enet->stop_cbarg = NULL;
enet->pause_cbfn = NULL;
enet->mtu_cbfn = NULL; enet->mtu_cbfn = NULL;
bfa_fsm_set_state(enet, bna_enet_sm_stopped); bfa_fsm_set_state(enet, bna_enet_sm_stopped);

3
drivers/net/ethernet/brocade/bna/bna_types.h
View File

@ -362,9 +362,6 @@ struct bna_enet {
void (*stop_cbfn)(void *); void (*stop_cbfn)(void *);
void *stop_cbarg; void *stop_cbarg;
/* Callback for bna_enet_pause_config() */
void (*pause_cbfn)(struct bnad *);
/* Callback for bna_enet_mtu_set() */ /* Callback for bna_enet_mtu_set() */
void (*mtu_cbfn)(struct bnad *); void (*mtu_cbfn)(struct bnad *);