diff options
author | Rasesh Mody <rmody@brocade.com> | 2011-07-22 04:07:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-22 20:01:13 -0400 |
commit | f374b36103cf22c9416f1004b0302b03fad79547 (patch) | |
tree | 651fbe01e201467f6b4de0bce79fa2a4af688c84 /drivers | |
parent | fdad400f1637576eacc8a45923103e965e086c28 (diff) |
bna: IOC Event Name Change
Change details:
- Changed event name IOC_E_PFAILED to IOC_E_PFFAILED
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bna/bfa_ioc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/bna/bfa_ioc.c index 889039cc2201..da56c2fe51b5 100644 --- a/drivers/net/bna/bfa_ioc.c +++ b/drivers/net/bna/bfa_ioc.c | |||
@@ -108,7 +108,7 @@ enum ioc_event { | |||
108 | IOC_E_FWRSP_GETATTR = 6, /*!< IOC get attribute response */ | 108 | IOC_E_FWRSP_GETATTR = 6, /*!< IOC get attribute response */ |
109 | IOC_E_DISABLED = 7, /*!< f/w disabled */ | 109 | IOC_E_DISABLED = 7, /*!< f/w disabled */ |
110 | IOC_E_INITFAILED = 8, /*!< failure notice by iocpf sm */ | 110 | IOC_E_INITFAILED = 8, /*!< failure notice by iocpf sm */ |
111 | IOC_E_PFAILED = 9, /*!< failure notice by iocpf sm */ | 111 | IOC_E_PFFAILED = 9, /*!< failure notice by iocpf sm */ |
112 | IOC_E_HBFAIL = 10, /*!< heartbeat failure */ | 112 | IOC_E_HBFAIL = 10, /*!< heartbeat failure */ |
113 | IOC_E_HWERROR = 11, /*!< hardware error interrupt */ | 113 | IOC_E_HWERROR = 11, /*!< hardware error interrupt */ |
114 | IOC_E_TIMEOUT = 12, /*!< timeout */ | 114 | IOC_E_TIMEOUT = 12, /*!< timeout */ |
@@ -295,12 +295,12 @@ bfa_ioc_sm_enabling(struct bfa_ioc *ioc, enum ioc_event event) | |||
295 | bfa_fsm_set_state(ioc, bfa_ioc_sm_getattr); | 295 | bfa_fsm_set_state(ioc, bfa_ioc_sm_getattr); |
296 | break; | 296 | break; |
297 | 297 | ||
298 | case IOC_E_PFAILED: | 298 | case IOC_E_PFFAILED: |
299 | /* !!! fall through !!! */ | 299 | /* !!! fall through !!! */ |
300 | case IOC_E_HWERROR: | 300 | case IOC_E_HWERROR: |
301 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE); | 301 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE); |
302 | bfa_fsm_set_state(ioc, bfa_ioc_sm_fail_retry); | 302 | bfa_fsm_set_state(ioc, bfa_ioc_sm_fail_retry); |
303 | if (event != IOC_E_PFAILED) | 303 | if (event != IOC_E_PFFAILED) |
304 | bfa_iocpf_initfail(ioc); | 304 | bfa_iocpf_initfail(ioc); |
305 | break; | 305 | break; |
306 | 306 | ||
@@ -345,14 +345,14 @@ bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event) | |||
345 | bfa_fsm_set_state(ioc, bfa_ioc_sm_op); | 345 | bfa_fsm_set_state(ioc, bfa_ioc_sm_op); |
346 | break; | 346 | break; |
347 | 347 | ||
348 | case IOC_E_PFAILED: | 348 | case IOC_E_PFFAILED: |
349 | case IOC_E_HWERROR: | 349 | case IOC_E_HWERROR: |
350 | del_timer(&ioc->ioc_timer); | 350 | del_timer(&ioc->ioc_timer); |
351 | /* fall through */ | 351 | /* fall through */ |
352 | case IOC_E_TIMEOUT: | 352 | case IOC_E_TIMEOUT: |
353 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE); | 353 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE); |
354 | bfa_fsm_set_state(ioc, bfa_ioc_sm_fail_retry); | 354 | bfa_fsm_set_state(ioc, bfa_ioc_sm_fail_retry); |
355 | if (event != IOC_E_PFAILED) | 355 | if (event != IOC_E_PFFAILED) |
356 | bfa_iocpf_getattrfail(ioc); | 356 | bfa_iocpf_getattrfail(ioc); |
357 | break; | 357 | break; |
358 | 358 | ||
@@ -388,7 +388,7 @@ bfa_ioc_sm_op(struct bfa_ioc *ioc, enum ioc_event event) | |||
388 | bfa_fsm_set_state(ioc, bfa_ioc_sm_disabling); | 388 | bfa_fsm_set_state(ioc, bfa_ioc_sm_disabling); |
389 | break; | 389 | break; |
390 | 390 | ||
391 | case IOC_E_PFAILED: | 391 | case IOC_E_PFFAILED: |
392 | case IOC_E_HWERROR: | 392 | case IOC_E_HWERROR: |
393 | bfa_ioc_hb_stop(ioc); | 393 | bfa_ioc_hb_stop(ioc); |
394 | /* !!! fall through !!! */ | 394 | /* !!! fall through !!! */ |
@@ -399,7 +399,7 @@ bfa_ioc_sm_op(struct bfa_ioc *ioc, enum ioc_event event) | |||
399 | else | 399 | else |
400 | bfa_fsm_set_state(ioc, bfa_ioc_sm_fail); | 400 | bfa_fsm_set_state(ioc, bfa_ioc_sm_fail); |
401 | 401 | ||
402 | if (event != IOC_E_PFAILED) | 402 | if (event != IOC_E_PFFAILED) |
403 | bfa_iocpf_fail(ioc); | 403 | bfa_iocpf_fail(ioc); |
404 | break; | 404 | break; |
405 | 405 | ||
@@ -486,13 +486,13 @@ bfa_ioc_sm_fail_retry(struct bfa_ioc *ioc, enum ioc_event event) | |||
486 | bfa_fsm_set_state(ioc, bfa_ioc_sm_getattr); | 486 | bfa_fsm_set_state(ioc, bfa_ioc_sm_getattr); |
487 | break; | 487 | break; |
488 | 488 | ||
489 | case IOC_E_PFAILED: | 489 | case IOC_E_PFFAILED: |
490 | case IOC_E_HWERROR: | 490 | case IOC_E_HWERROR: |
491 | /** | 491 | /** |
492 | * Initialization retry failed. | 492 | * Initialization retry failed. |
493 | */ | 493 | */ |
494 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE); | 494 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE); |
495 | if (event != IOC_E_PFAILED) | 495 | if (event != IOC_E_PFFAILED) |
496 | bfa_iocpf_initfail(ioc); | 496 | bfa_iocpf_initfail(ioc); |
497 | break; | 497 | break; |
498 | 498 | ||
@@ -1685,7 +1685,7 @@ bfa_ioc_pf_initfailed(struct bfa_ioc *ioc) | |||
1685 | static void | 1685 | static void |
1686 | bfa_ioc_pf_failed(struct bfa_ioc *ioc) | 1686 | bfa_ioc_pf_failed(struct bfa_ioc *ioc) |
1687 | { | 1687 | { |
1688 | bfa_fsm_send_event(ioc, IOC_E_PFAILED); | 1688 | bfa_fsm_send_event(ioc, IOC_E_PFFAILED); |
1689 | } | 1689 | } |
1690 | 1690 | ||
1691 | static void | 1691 | static void |