bna: remove unused cbfn parameter

[cascardo/linux.git] / drivers / net / ethernet / brocade / bna / bna_enet.c

diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
index deb8da6..b8de17b 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
@@ -207,7 +207,7 @@ bna_bfi_stats_get_rsp(struct bna *bna, struct bfi_msgq_mhdr *msghdr)
        for (i = 0; i < BFI_ENET_CFG_MAX; i++) {
                stats_dst = (u64 *)&(bna->stats.hw_stats.rxf_stats[i]);
                memset(stats_dst, 0, sizeof(struct bfi_enet_stats_rxf));
-               if (rx_enet_mask & ((u32)(1 << i))) {
+               if (rx_enet_mask & ((u32)BIT(i))) {
                        int k;
                        count = sizeof(struct bfi_enet_stats_rxf) /
                                sizeof(u64);
@@ -222,7 +222,7 @@ bna_bfi_stats_get_rsp(struct bna *bna, struct bfi_msgq_mhdr *msghdr)
        for (i = 0; i < BFI_ENET_CFG_MAX; i++) {
                stats_dst = (u64 *)&(bna->stats.hw_stats.txf_stats[i]);
                memset(stats_dst, 0, sizeof(struct bfi_enet_stats_txf));
-               if (tx_enet_mask & ((u32)(1 << i))) {
+               if (tx_enet_mask & ((u32)BIT(i))) {
                        int k;
                        count = sizeof(struct bfi_enet_stats_txf) /
                                sizeof(u64);
@@ -1308,13 +1308,10 @@ bna_enet_disable(struct bna_enet *enet, enum bna_cleanup_type type,
 
 void
 bna_enet_pause_config(struct bna_enet *enet,
-                     struct bna_pause_config *pause_config,
-                     void (*cbfn)(struct bnad *))
+                     struct bna_pause_config *pause_config)
 {
        enet->pause_config = *pause_config;
 
-       enet->pause_cbfn = cbfn;
-
        bfa_fsm_send_event(enet, ENET_E_PAUSE_CFG);
 }
 
@@ -1330,9 +1327,9 @@ bna_enet_mtu_set(struct bna_enet *enet, int mtu,
 }
 
 void
-bna_enet_perm_mac_get(struct bna_enet *enet, mac_t *mac)
+bna_enet_perm_mac_get(struct bna_enet *enet, u8 *mac)
 {
-       *mac = bfa_nw_ioc_get_mac(&enet->bna->ioceth.ioc);
+       bfa_nw_ioc_get_mac(&enet->bna->ioceth.ioc, mac);
 }
 
 /* IOCETH */