bna: get rid of duplicate and unused macros

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

diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
index 68f3c13..29e0428 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
@@ -23,14 +23,6 @@
 
 /* IOC local definitions */
 
-#define bfa_ioc_state_disabled(__sm)                   \
-       (((__sm) == BFI_IOC_UNINIT) ||                  \
-        ((__sm) == BFI_IOC_INITING) ||                 \
-        ((__sm) == BFI_IOC_HWINIT) ||                  \
-        ((__sm) == BFI_IOC_DISABLED) ||                \
-        ((__sm) == BFI_IOC_FAIL) ||                    \
-        ((__sm) == BFI_IOC_CFG_DISABLED))
-
 /* Asic specific macros : see bfa_hw_cb.c and bfa_hw_ct.c for details. */
 
 #define bfa_ioc_firmware_lock(__ioc)                   \
@@ -57,12 +49,6 @@
                        ((__ioc)->ioc_hwif->ioc_get_fwstate(__ioc))
 #define bfa_ioc_set_alt_ioc_fwstate(__ioc, __fwstate)          \
                ((__ioc)->ioc_hwif->ioc_set_alt_fwstate(__ioc, __fwstate))
-#define bfa_ioc_get_alt_ioc_fwstate(__ioc)             \
-                       ((__ioc)->ioc_hwif->ioc_get_alt_fwstate(__ioc))
-
-#define bfa_ioc_mbox_cmd_pending(__ioc)                \
-                       (!list_empty(&((__ioc)->mbox_mod.cmd_q)) || \
-                       readl((__ioc)->ioc_regs.hfn_mbox_cmd))
 
 static bool bfa_nw_auto_recover = true;
 
@@ -2796,7 +2782,7 @@ bfa_ioc_get_adapter_attr(struct bfa_ioc *ioc,
                ad_attr->prototype = 0;
 
        ad_attr->pwwn = bfa_ioc_get_pwwn(ioc);
-       ad_attr->mac  = bfa_nw_ioc_get_mac(ioc);
+       bfa_nw_ioc_get_mac(ioc, ad_attr->mac);
 
        ad_attr->pcie_gen = ioc_attr->pcie_gen;
        ad_attr->pcie_lanes = ioc_attr->pcie_lanes;
@@ -2942,10 +2928,10 @@ bfa_ioc_get_pwwn(struct bfa_ioc *ioc)
        return ioc->attr->pwwn;
 }
 
-mac_t
-bfa_nw_ioc_get_mac(struct bfa_ioc *ioc)
+void
+bfa_nw_ioc_get_mac(struct bfa_ioc *ioc, u8 *mac)
 {
-       return ioc->attr->mac;
+       ether_addr_copy(mac, ioc->attr->mac);
 }
 
 /* Firmware failure detected. Start recovery actions. */