diff options
author | Rasesh Mody <rmody@brocade.com> | 2011-09-27 06:39:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-29 19:36:35 -0400 |
commit | aafd5c2c3cba257888450796b916a7335ee21236 (patch) | |
tree | f334249696a930c8f22b089e5db052ff4c18db88 /drivers/net/ethernet/brocade/bna/bfa_ioc.c | |
parent | 586b2816e3eaf187341f75c4f4e27404f943cb29 (diff) |
bna: PLL Init Fix and Add Stats Attributes
Change details:
- Fix to release soft reset in PLL init for HW
- Added stats attributes and new bfi msg class
- Removed some unused code and typo fixes
Signed-off-by: Gurunatha Karaje <gkaraje@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bfa_ioc.c')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c index f89ac7a6569d..e02d6071a9c4 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c | |||
@@ -17,8 +17,6 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "bfa_ioc.h" | 19 | #include "bfa_ioc.h" |
20 | #include "cna.h" | ||
21 | #include "bfi.h" | ||
22 | #include "bfi_reg.h" | 20 | #include "bfi_reg.h" |
23 | #include "bfa_defs.h" | 21 | #include "bfa_defs.h" |
24 | 22 | ||
@@ -140,10 +138,6 @@ static struct bfa_sm_table ioc_sm_table[] = { | |||
140 | {BFA_SM(bfa_ioc_sm_hwfail), BFA_IOC_HWFAIL}, | 138 | {BFA_SM(bfa_ioc_sm_hwfail), BFA_IOC_HWFAIL}, |
141 | }; | 139 | }; |
142 | 140 | ||
143 | /** | ||
144 | * IOCPF state machine definitions/declarations | ||
145 | */ | ||
146 | |||
147 | /* | 141 | /* |
148 | * Forward declareations for iocpf state machine | 142 | * Forward declareations for iocpf state machine |
149 | */ | 143 | */ |
@@ -427,7 +421,7 @@ bfa_ioc_sm_disabling_entry(struct bfa_ioc *ioc) | |||
427 | } | 421 | } |
428 | 422 | ||
429 | /** | 423 | /** |
430 | * IOC is being desabled | 424 | * IOC is being disabled |
431 | */ | 425 | */ |
432 | static void | 426 | static void |
433 | bfa_ioc_sm_disabling(struct bfa_ioc *ioc, enum ioc_event event) | 427 | bfa_ioc_sm_disabling(struct bfa_ioc *ioc, enum ioc_event event) |
@@ -457,7 +451,7 @@ bfa_ioc_sm_disabling(struct bfa_ioc *ioc, enum ioc_event event) | |||
457 | } | 451 | } |
458 | 452 | ||
459 | /** | 453 | /** |
460 | * IOC desable completion entry. | 454 | * IOC disable completion entry. |
461 | */ | 455 | */ |
462 | static void | 456 | static void |
463 | bfa_ioc_sm_disabled_entry(struct bfa_ioc *ioc) | 457 | bfa_ioc_sm_disabled_entry(struct bfa_ioc *ioc) |
@@ -782,7 +776,7 @@ static void | |||
782 | bfa_iocpf_sm_hwinit_entry(struct bfa_iocpf *iocpf) | 776 | bfa_iocpf_sm_hwinit_entry(struct bfa_iocpf *iocpf) |
783 | { | 777 | { |
784 | iocpf->poll_time = 0; | 778 | iocpf->poll_time = 0; |
785 | bfa_ioc_reset(iocpf->ioc, 0); | 779 | bfa_ioc_reset(iocpf->ioc, false); |
786 | } | 780 | } |
787 | 781 | ||
788 | /** | 782 | /** |
@@ -1759,6 +1753,9 @@ bfa_ioc_fail_notify(struct bfa_ioc *ioc) | |||
1759 | bfa_ioc_event_notify(ioc, BFA_IOC_E_FAILED); | 1753 | bfa_ioc_event_notify(ioc, BFA_IOC_E_FAILED); |
1760 | } | 1754 | } |
1761 | 1755 | ||
1756 | /** | ||
1757 | * IOCPF to IOC interface | ||
1758 | */ | ||
1762 | static void | 1759 | static void |
1763 | bfa_ioc_pf_enabled(struct bfa_ioc *ioc) | 1760 | bfa_ioc_pf_enabled(struct bfa_ioc *ioc) |
1764 | { | 1761 | { |
@@ -2292,9 +2289,6 @@ bfa_ioc_get_adapter_model(struct bfa_ioc *ioc, char *model) | |||
2292 | 2289 | ||
2293 | ioc_attr = ioc->attr; | 2290 | ioc_attr = ioc->attr; |
2294 | 2291 | ||
2295 | /** | ||
2296 | * model name | ||
2297 | */ | ||
2298 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, "%s-%u", | 2292 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, "%s-%u", |
2299 | BFA_MFG_NAME, ioc_attr->card_type); | 2293 | BFA_MFG_NAME, ioc_attr->card_type); |
2300 | } | 2294 | } |