aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRasesh Mody <rmody@brocade.com>2011-07-22 04:07:43 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-22 20:01:13 -0400
commitac51f60f50f742745b316d51bd12fcada5e7778d (patch)
tree4da13a859ff98f7f42ba6dec40d2f8e12f08fb89 /drivers
parentbd5a92e9a0eb03c4e7d04c64aa99e9050459faf5 (diff)
bna: State Machine Fault Handling Cleanup
Chnage details: - The module name is not used in case of state machine fault, hence no longer passing the module name to the fault handler. 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.c46
-rw-r--r--drivers/net/bna/bna_ctrl.c42
-rw-r--r--drivers/net/bna/bna_txrx.c38
-rw-r--r--drivers/net/bna/cna.h2
4 files changed, 64 insertions, 64 deletions
diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/bna/bfa_ioc.c
index c52ef6347dc6..a13b4c5e2e7b 100644
--- a/drivers/net/bna/bfa_ioc.c
+++ b/drivers/net/bna/bfa_ioc.c
@@ -240,7 +240,7 @@ bfa_ioc_sm_uninit(struct bfa_ioc *ioc, enum ioc_event event)
240 break; 240 break;
241 241
242 default: 242 default:
243 bfa_sm_fault(ioc, event); 243 bfa_sm_fault(event);
244 } 244 }
245} 245}
246 246
@@ -273,7 +273,7 @@ bfa_ioc_sm_reset(struct bfa_ioc *ioc, enum ioc_event event)
273 break; 273 break;
274 274
275 default: 275 default:
276 bfa_sm_fault(ioc, event); 276 bfa_sm_fault(event);
277 } 277 }
278} 278}
279 279
@@ -317,7 +317,7 @@ bfa_ioc_sm_enabling(struct bfa_ioc *ioc, enum ioc_event event)
317 break; 317 break;
318 318
319 default: 319 default:
320 bfa_sm_fault(ioc, event); 320 bfa_sm_fault(event);
321 } 321 }
322} 322}
323 323
@@ -365,7 +365,7 @@ bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event)
365 break; 365 break;
366 366
367 default: 367 default:
368 bfa_sm_fault(ioc, event); 368 bfa_sm_fault(event);
369 } 369 }
370} 370}
371 371
@@ -404,7 +404,7 @@ bfa_ioc_sm_op(struct bfa_ioc *ioc, enum ioc_event event)
404 break; 404 break;
405 405
406 default: 406 default:
407 bfa_sm_fault(ioc, event); 407 bfa_sm_fault(event);
408 } 408 }
409} 409}
410 410
@@ -435,7 +435,7 @@ bfa_ioc_sm_disabling(struct bfa_ioc *ioc, enum ioc_event event)
435 break; 435 break;
436 436
437 default: 437 default:
438 bfa_sm_fault(ioc, event); 438 bfa_sm_fault(event);
439 } 439 }
440} 440}
441 441
@@ -466,7 +466,7 @@ bfa_ioc_sm_disabled(struct bfa_ioc *ioc, enum ioc_event event)
466 break; 466 break;
467 467
468 default: 468 default:
469 bfa_sm_fault(ioc, event); 469 bfa_sm_fault(event);
470 } 470 }
471} 471}
472 472
@@ -513,7 +513,7 @@ bfa_ioc_sm_fail_retry(struct bfa_ioc *ioc, enum ioc_event event)
513 break; 513 break;
514 514
515 default: 515 default:
516 bfa_sm_fault(ioc, event); 516 bfa_sm_fault(event);
517 } 517 }
518} 518}
519 519
@@ -547,7 +547,7 @@ bfa_ioc_sm_fail(struct bfa_ioc *ioc, enum ioc_event event)
547 break; 547 break;
548 548
549 default: 549 default:
550 bfa_sm_fault(ioc, event); 550 bfa_sm_fault(event);
551 } 551 }
552} 552}
553 553
@@ -580,7 +580,7 @@ bfa_iocpf_sm_reset(struct bfa_iocpf *iocpf, enum iocpf_event event)
580 break; 580 break;
581 581
582 default: 582 default:
583 bfa_sm_fault(iocpf->ioc, event); 583 bfa_sm_fault(event);
584 } 584 }
585} 585}
586 586
@@ -632,7 +632,7 @@ bfa_iocpf_sm_fwcheck(struct bfa_iocpf *iocpf, enum iocpf_event event)
632 break; 632 break;
633 633
634 default: 634 default:
635 bfa_sm_fault(ioc, event); 635 bfa_sm_fault(event);
636 } 636 }
637} 637}
638 638
@@ -676,7 +676,7 @@ bfa_iocpf_sm_mismatch(struct bfa_iocpf *iocpf, enum iocpf_event event)
676 break; 676 break;
677 677
678 default: 678 default:
679 bfa_sm_fault(ioc, event); 679 bfa_sm_fault(event);
680 } 680 }
681} 681}
682 682
@@ -715,7 +715,7 @@ bfa_iocpf_sm_semwait(struct bfa_iocpf *iocpf, enum iocpf_event event)
715 break; 715 break;
716 716
717 default: 717 default:
718 bfa_sm_fault(ioc, event); 718 bfa_sm_fault(event);
719 } 719 }
720} 720}
721 721
@@ -763,7 +763,7 @@ bfa_iocpf_sm_hwinit(struct bfa_iocpf *iocpf, enum iocpf_event event)
763 break; 763 break;
764 764
765 default: 765 default:
766 bfa_sm_fault(ioc, event); 766 bfa_sm_fault(event);
767 } 767 }
768} 768}
769 769
@@ -814,7 +814,7 @@ bfa_iocpf_sm_enabling(struct bfa_iocpf *iocpf, enum iocpf_event event)
814 break; 814 break;
815 815
816 default: 816 default:
817 bfa_sm_fault(ioc, event); 817 bfa_sm_fault(event);
818 } 818 }
819} 819}
820 820
@@ -857,7 +857,7 @@ bfa_iocpf_sm_ready(struct bfa_iocpf *iocpf, enum iocpf_event event)
857 break; 857 break;
858 858
859 default: 859 default:
860 bfa_sm_fault(ioc, event); 860 bfa_sm_fault(event);
861 } 861 }
862} 862}
863 863
@@ -899,7 +899,7 @@ bfa_iocpf_sm_disabling(struct bfa_iocpf *iocpf, enum iocpf_event event)
899 break; 899 break;
900 900
901 default: 901 default:
902 bfa_sm_fault(ioc, event); 902 bfa_sm_fault(event);
903 } 903 }
904} 904}
905 905
@@ -928,7 +928,7 @@ bfa_iocpf_sm_disabling_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
928 break; 928 break;
929 929
930 default: 930 default:
931 bfa_sm_fault(ioc, event); 931 bfa_sm_fault(event);
932 } 932 }
933} 933}
934 934
@@ -958,7 +958,7 @@ bfa_iocpf_sm_disabled(struct bfa_iocpf *iocpf, enum iocpf_event event)
958 break; 958 break;
959 959
960 default: 960 default:
961 bfa_sm_fault(ioc, event); 961 bfa_sm_fault(event);
962 } 962 }
963} 963}
964 964
@@ -1010,7 +1010,7 @@ bfa_iocpf_sm_initfail_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
1010 break; 1010 break;
1011 1011
1012 default: 1012 default:
1013 bfa_sm_fault(ioc, event); 1013 bfa_sm_fault(event);
1014 } 1014 }
1015} 1015}
1016 1016
@@ -1039,7 +1039,7 @@ bfa_iocpf_sm_initfail(struct bfa_iocpf *iocpf, enum iocpf_event event)
1039 break; 1039 break;
1040 1040
1041 default: 1041 default:
1042 bfa_sm_fault(ioc, event); 1042 bfa_sm_fault(event);
1043 } 1043 }
1044} 1044}
1045 1045
@@ -1094,7 +1094,7 @@ bfa_iocpf_sm_fail_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
1094 break; 1094 break;
1095 1095
1096 default: 1096 default:
1097 bfa_sm_fault(ioc, event); 1097 bfa_sm_fault(event);
1098 } 1098 }
1099} 1099}
1100 1100
@@ -1116,7 +1116,7 @@ bfa_iocpf_sm_fail(struct bfa_iocpf *iocpf, enum iocpf_event event)
1116 break; 1116 break;
1117 1117
1118 default: 1118 default:
1119 bfa_sm_fault(iocpf->ioc, event); 1119 bfa_sm_fault(event);
1120 } 1120 }
1121} 1121}
1122 1122
diff --git a/drivers/net/bna/bna_ctrl.c b/drivers/net/bna/bna_ctrl.c
index 53b14169e363..7d9bc2ff3a45 100644
--- a/drivers/net/bna/bna_ctrl.c
+++ b/drivers/net/bna/bna_ctrl.c
@@ -380,7 +380,7 @@ bna_llport_sm_stopped(struct bna_llport *llport,
380 break; 380 break;
381 381
382 default: 382 default:
383 bfa_sm_fault(llport->bna, event); 383 bfa_sm_fault(event);
384 } 384 }
385} 385}
386 386
@@ -409,7 +409,7 @@ bna_llport_sm_down(struct bna_llport *llport,
409 break; 409 break;
410 410
411 default: 411 default:
412 bfa_sm_fault(llport->bna, event); 412 bfa_sm_fault(event);
413 } 413 }
414} 414}
415 415
@@ -455,7 +455,7 @@ bna_llport_sm_up_resp_wait(struct bna_llport *llport,
455 break; 455 break;
456 456
457 default: 457 default:
458 bfa_sm_fault(llport->bna, event); 458 bfa_sm_fault(event);
459 } 459 }
460} 460}
461 461
@@ -497,7 +497,7 @@ bna_llport_sm_down_resp_wait(struct bna_llport *llport,
497 break; 497 break;
498 498
499 default: 499 default:
500 bfa_sm_fault(llport->bna, event); 500 bfa_sm_fault(event);
501 } 501 }
502} 502}
503 503
@@ -526,7 +526,7 @@ bna_llport_sm_up(struct bna_llport *llport,
526 break; 526 break;
527 527
528 default: 528 default:
529 bfa_sm_fault(llport->bna, event); 529 bfa_sm_fault(event);
530 } 530 }
531} 531}
532 532
@@ -563,7 +563,7 @@ bna_llport_sm_last_resp_wait(struct bna_llport *llport,
563 break; 563 break;
564 564
565 default: 565 default:
566 bfa_sm_fault(llport->bna, event); 566 bfa_sm_fault(event);
567 } 567 }
568} 568}
569 569
@@ -916,7 +916,7 @@ bna_port_sm_stopped(struct bna_port *port, enum bna_port_event event)
916 break; 916 break;
917 917
918 default: 918 default:
919 bfa_sm_fault(port->bna, event); 919 bfa_sm_fault(event);
920 } 920 }
921} 921}
922 922
@@ -956,7 +956,7 @@ bna_port_sm_mtu_init_wait(struct bna_port *port, enum bna_port_event event)
956 break; 956 break;
957 957
958 default: 958 default:
959 bfa_sm_fault(port->bna, event); 959 bfa_sm_fault(event);
960 } 960 }
961} 961}
962 962
@@ -1001,7 +1001,7 @@ bna_port_sm_pause_init_wait(struct bna_port *port,
1001 break; 1001 break;
1002 1002
1003 default: 1003 default:
1004 bfa_sm_fault(port->bna, event); 1004 bfa_sm_fault(event);
1005 } 1005 }
1006} 1006}
1007 1007
@@ -1022,7 +1022,7 @@ bna_port_sm_last_resp_wait(struct bna_port *port,
1022 break; 1022 break;
1023 1023
1024 default: 1024 default:
1025 bfa_sm_fault(port->bna, event); 1025 bfa_sm_fault(event);
1026 } 1026 }
1027} 1027}
1028 1028
@@ -1061,7 +1061,7 @@ bna_port_sm_started(struct bna_port *port,
1061 break; 1061 break;
1062 1062
1063 default: 1063 default:
1064 bfa_sm_fault(port->bna, event); 1064 bfa_sm_fault(event);
1065 } 1065 }
1066} 1066}
1067 1067
@@ -1086,7 +1086,7 @@ bna_port_sm_pause_cfg_wait(struct bna_port *port,
1086 break; 1086 break;
1087 1087
1088 default: 1088 default:
1089 bfa_sm_fault(port->bna, event); 1089 bfa_sm_fault(event);
1090 } 1090 }
1091} 1091}
1092 1092
@@ -1111,7 +1111,7 @@ bna_port_sm_rx_stop_wait(struct bna_port *port,
1111 break; 1111 break;
1112 1112
1113 default: 1113 default:
1114 bfa_sm_fault(port->bna, event); 1114 bfa_sm_fault(event);
1115 } 1115 }
1116} 1116}
1117 1117
@@ -1136,7 +1136,7 @@ bna_port_sm_mtu_cfg_wait(struct bna_port *port, enum bna_port_event event)
1136 break; 1136 break;
1137 1137
1138 default: 1138 default:
1139 bfa_sm_fault(port->bna, event); 1139 bfa_sm_fault(event);
1140 } 1140 }
1141} 1141}
1142 1142
@@ -1161,7 +1161,7 @@ bna_port_sm_chld_stop_wait(struct bna_port *port,
1161 break; 1161 break;
1162 1162
1163 default: 1163 default:
1164 bfa_sm_fault(port->bna, event); 1164 bfa_sm_fault(event);
1165 } 1165 }
1166} 1166}
1167 1167
@@ -1472,7 +1472,7 @@ bna_device_sm_stopped(struct bna_device *device,
1472 break; 1472 break;
1473 1473
1474 default: 1474 default:
1475 bfa_sm_fault(device->bna, event); 1475 bfa_sm_fault(event);
1476 } 1476 }
1477} 1477}
1478 1478
@@ -1512,7 +1512,7 @@ bna_device_sm_ioc_ready_wait(struct bna_device *device,
1512 break; 1512 break;
1513 1513
1514 default: 1514 default:
1515 bfa_sm_fault(device->bna, event); 1515 bfa_sm_fault(event);
1516 } 1516 }
1517} 1517}
1518 1518
@@ -1542,7 +1542,7 @@ bna_device_sm_ready(struct bna_device *device, enum bna_device_event event)
1542 break; 1542 break;
1543 1543
1544 default: 1544 default:
1545 bfa_sm_fault(device->bna, event); 1545 bfa_sm_fault(event);
1546 } 1546 }
1547} 1547}
1548 1548
@@ -1568,7 +1568,7 @@ bna_device_sm_port_stop_wait(struct bna_device *device,
1568 break; 1568 break;
1569 1569
1570 default: 1570 default:
1571 bfa_sm_fault(device->bna, event); 1571 bfa_sm_fault(event);
1572 } 1572 }
1573} 1573}
1574 1574
@@ -1589,7 +1589,7 @@ bna_device_sm_ioc_disable_wait(struct bna_device *device,
1589 break; 1589 break;
1590 1590
1591 default: 1591 default:
1592 bfa_sm_fault(device->bna, event); 1592 bfa_sm_fault(event);
1593 } 1593 }
1594} 1594}
1595 1595
@@ -1622,7 +1622,7 @@ bna_device_sm_failed(struct bna_device *device,
1622 break; 1622 break;
1623 1623
1624 default: 1624 default:
1625 bfa_sm_fault(device->bna, event); 1625 bfa_sm_fault(event);
1626 } 1626 }
1627} 1627}
1628 1628
diff --git a/drivers/net/bna/bna_txrx.c b/drivers/net/bna/bna_txrx.c
index 2c06e089bb8e..4d4f4d97a345 100644
--- a/drivers/net/bna/bna_txrx.c
+++ b/drivers/net/bna/bna_txrx.c
@@ -569,7 +569,7 @@ bna_rxf_sm_stopped(struct bna_rxf *rxf, enum bna_rxf_event event)
569 break; 569 break;
570 570
571 default: 571 default:
572 bfa_sm_fault(rxf->rx->bna, event); 572 bfa_sm_fault(event);
573 } 573 }
574} 574}
575 575
@@ -627,7 +627,7 @@ bna_rxf_sm_start_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
627 break; 627 break;
628 628
629 default: 629 default:
630 bfa_sm_fault(rxf->rx->bna, event); 630 bfa_sm_fault(event);
631 } 631 }
632} 632}
633 633
@@ -678,7 +678,7 @@ bna_rxf_sm_cam_fltr_mod_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
678 break; 678 break;
679 679
680 default: 680 default:
681 bfa_sm_fault(rxf->rx->bna, event); 681 bfa_sm_fault(event);
682 } 682 }
683} 683}
684 684
@@ -724,7 +724,7 @@ bna_rxf_sm_started(struct bna_rxf *rxf, enum bna_rxf_event event)
724 break; 724 break;
725 725
726 default: 726 default:
727 bfa_sm_fault(rxf->rx->bna, event); 727 bfa_sm_fault(event);
728 } 728 }
729} 729}
730 730
@@ -761,7 +761,7 @@ bna_rxf_sm_cam_fltr_clr_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
761 break; 761 break;
762 762
763 default: 763 default:
764 bfa_sm_fault(rxf->rx->bna, event); 764 bfa_sm_fault(event);
765 } 765 }
766} 766}
767 767
@@ -815,7 +815,7 @@ bna_rxf_sm_stop_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
815 break; 815 break;
816 816
817 default: 817 default:
818 bfa_sm_fault(rxf->rx->bna, event); 818 bfa_sm_fault(event);
819 } 819 }
820} 820}
821 821
@@ -851,7 +851,7 @@ bna_rxf_sm_pause_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
851 * any other event during these states 851 * any other event during these states
852 */ 852 */
853 default: 853 default:
854 bfa_sm_fault(rxf->rx->bna, event); 854 bfa_sm_fault(event);
855 } 855 }
856} 856}
857 857
@@ -887,7 +887,7 @@ bna_rxf_sm_resume_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
887 * any other event during these states 887 * any other event during these states
888 */ 888 */
889 default: 889 default:
890 bfa_sm_fault(rxf->rx->bna, event); 890 bfa_sm_fault(event);
891 } 891 }
892} 892}
893 893
@@ -907,7 +907,7 @@ bna_rxf_sm_stat_clr_wait(struct bna_rxf *rxf, enum bna_rxf_event event)
907 break; 907 break;
908 908
909 default: 909 default:
910 bfa_sm_fault(rxf->rx->bna, event); 910 bfa_sm_fault(event);
911 } 911 }
912} 912}
913 913
@@ -1898,7 +1898,7 @@ static void bna_rx_sm_stopped(struct bna_rx *rx,
1898 /* no-op */ 1898 /* no-op */
1899 break; 1899 break;
1900 default: 1900 default:
1901 bfa_sm_fault(rx->bna, event); 1901 bfa_sm_fault(event);
1902 break; 1902 break;
1903 } 1903 }
1904 1904
@@ -1946,7 +1946,7 @@ static void bna_rx_sm_rxf_start_wait(struct bna_rx *rx,
1946 bfa_fsm_set_state(rx, bna_rx_sm_started); 1946 bfa_fsm_set_state(rx, bna_rx_sm_started);
1947 break; 1947 break;
1948 default: 1948 default:
1949 bfa_sm_fault(rx->bna, event); 1949 bfa_sm_fault(event);
1950 break; 1950 break;
1951 } 1951 }
1952} 1952}
@@ -1981,7 +1981,7 @@ bna_rx_sm_started(struct bna_rx *rx, enum bna_rx_event event)
1981 bfa_fsm_set_state(rx, bna_rx_sm_rxf_stop_wait); 1981 bfa_fsm_set_state(rx, bna_rx_sm_rxf_stop_wait);
1982 break; 1982 break;
1983 default: 1983 default:
1984 bfa_sm_fault(rx->bna, event); 1984 bfa_sm_fault(event);
1985 break; 1985 break;
1986 } 1986 }
1987} 1987}
@@ -2011,7 +2011,7 @@ bna_rx_sm_rxf_stop_wait(struct bna_rx *rx, enum bna_rx_event event)
2011 bna_rxf_fail(&rx->rxf); 2011 bna_rxf_fail(&rx->rxf);
2012 break; 2012 break;
2013 default: 2013 default:
2014 bfa_sm_fault(rx->bna, event); 2014 bfa_sm_fault(event);
2015 break; 2015 break;
2016 } 2016 }
2017 2017
@@ -2064,7 +2064,7 @@ bna_rx_sm_rxq_stop_wait(struct bna_rx *rx, enum bna_rx_event event)
2064 bfa_fsm_set_state(rx, bna_rx_sm_stopped); 2064 bfa_fsm_set_state(rx, bna_rx_sm_stopped);
2065 break; 2065 break;
2066 default: 2066 default:
2067 bfa_sm_fault(rx->bna, event); 2067 bfa_sm_fault(event);
2068 break; 2068 break;
2069 } 2069 }
2070} 2070}
@@ -3216,7 +3216,7 @@ bna_tx_sm_stopped(struct bna_tx *tx, enum bna_tx_event event)
3216 break; 3216 break;
3217 3217
3218 default: 3218 default:
3219 bfa_sm_fault(tx->bna, event); 3219 bfa_sm_fault(event);
3220 } 3220 }
3221} 3221}
3222 3222
@@ -3261,7 +3261,7 @@ bna_tx_sm_started(struct bna_tx *tx, enum bna_tx_event event)
3261 break; 3261 break;
3262 3262
3263 default: 3263 default:
3264 bfa_sm_fault(tx->bna, event); 3264 bfa_sm_fault(event);
3265 } 3265 }
3266} 3266}
3267 3267
@@ -3294,7 +3294,7 @@ bna_tx_sm_txq_stop_wait(struct bna_tx *tx, enum bna_tx_event event)
3294 break; 3294 break;
3295 3295
3296 default: 3296 default:
3297 bfa_sm_fault(tx->bna, event); 3297 bfa_sm_fault(event);
3298 } 3298 }
3299} 3299}
3300 3300
@@ -3335,7 +3335,7 @@ bna_tx_sm_prio_stop_wait(struct bna_tx *tx, enum bna_tx_event event)
3335 break; 3335 break;
3336 3336
3337 default: 3337 default:
3338 bfa_sm_fault(tx->bna, event); 3338 bfa_sm_fault(event);
3339 } 3339 }
3340} 3340}
3341 3341
@@ -3355,7 +3355,7 @@ bna_tx_sm_stat_clr_wait(struct bna_tx *tx, enum bna_tx_event event)
3355 break; 3355 break;
3356 3356
3357 default: 3357 default:
3358 bfa_sm_fault(tx->bna, event); 3358 bfa_sm_fault(event);
3359 } 3359 }
3360} 3360}
3361 3361
diff --git a/drivers/net/bna/cna.h b/drivers/net/bna/cna.h
index 01b4af733021..a679e038747b 100644
--- a/drivers/net/bna/cna.h
+++ b/drivers/net/bna/cna.h
@@ -33,7 +33,7 @@
33 33
34#include <linux/list.h> 34#include <linux/list.h>
35 35
36#define bfa_sm_fault(__mod, __event) do { \ 36#define bfa_sm_fault(__event) do { \
37 pr_err("SM Assertion failure: %s: %d: event = %d", __FILE__, __LINE__, \ 37 pr_err("SM Assertion failure: %s: %d: event = %d", __FILE__, __LINE__, \
38 __event); \ 38 __event); \
39} while (0) 39} while (0)