diff options
Diffstat (limited to 'drivers/scsi/bfa/bfa_ioc.c')
-rw-r--r-- | drivers/scsi/bfa/bfa_ioc.c | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c index 7b4a567ca22a..bfe3a87c0b6f 100644 --- a/drivers/scsi/bfa/bfa_ioc.c +++ b/drivers/scsi/bfa/bfa_ioc.c | |||
@@ -2399,12 +2399,6 @@ bfa_ioc_error_isr(struct bfa_ioc_s *ioc) | |||
2399 | bfa_fsm_send_event(ioc, IOC_E_HWERROR); | 2399 | bfa_fsm_send_event(ioc, IOC_E_HWERROR); |
2400 | } | 2400 | } |
2401 | 2401 | ||
2402 | void | ||
2403 | bfa_ioc_set_fcmode(struct bfa_ioc_s *ioc) | ||
2404 | { | ||
2405 | ioc->fcmode = BFA_TRUE; | ||
2406 | } | ||
2407 | |||
2408 | /* | 2402 | /* |
2409 | * return true if IOC is disabled | 2403 | * return true if IOC is disabled |
2410 | */ | 2404 | */ |
@@ -2592,35 +2586,7 @@ bfa_ioc_get_adapter_model(struct bfa_ioc_s *ioc, char *model) | |||
2592 | 2586 | ||
2593 | ioc_attr = ioc->attr; | 2587 | ioc_attr = ioc->attr; |
2594 | 2588 | ||
2595 | /* | 2589 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, "%s-%u", |
2596 | * model name | ||
2597 | */ | ||
2598 | if (ioc->asic_gen == BFI_ASIC_GEN_CT2) { | ||
2599 | int np = bfa_ioc_get_nports(ioc); | ||
2600 | char c; | ||
2601 | switch (ioc_attr->card_type) { | ||
2602 | case BFA_MFG_TYPE_PROWLER_F: | ||
2603 | case BFA_MFG_TYPE_PROWLER_N: | ||
2604 | case BFA_MFG_TYPE_PROWLER_C: | ||
2605 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, | ||
2606 | "%s-%u-%u", | ||
2607 | BFA_MFG_NAME, ioc_attr->card_type, np); | ||
2608 | break; | ||
2609 | case BFA_MFG_TYPE_PROWLER_D: | ||
2610 | if (ioc_attr->ic == BFA_MFG_IC_FC) | ||
2611 | c = 'F'; | ||
2612 | else | ||
2613 | c = 'P'; | ||
2614 | |||
2615 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, | ||
2616 | "%s-%u-%u%c", | ||
2617 | BFA_MFG_NAME, ioc_attr->card_type, np, c); | ||
2618 | break; | ||
2619 | default: | ||
2620 | break; | ||
2621 | } | ||
2622 | } else | ||
2623 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, "%s-%u", | ||
2624 | BFA_MFG_NAME, ioc_attr->card_type); | 2590 | BFA_MFG_NAME, ioc_attr->card_type); |
2625 | } | 2591 | } |
2626 | 2592 | ||
@@ -2711,12 +2677,6 @@ bfa_ioc_get_mfg_mac(struct bfa_ioc_s *ioc) | |||
2711 | return m; | 2677 | return m; |
2712 | } | 2678 | } |
2713 | 2679 | ||
2714 | bfa_boolean_t | ||
2715 | bfa_ioc_get_fcmode(struct bfa_ioc_s *ioc) | ||
2716 | { | ||
2717 | return ioc->fcmode || bfa_asic_id_cb(ioc->pcidev.device_id); | ||
2718 | } | ||
2719 | |||
2720 | /* | 2680 | /* |
2721 | * Retrieve saved firmware trace from a prior IOC failure. | 2681 | * Retrieve saved firmware trace from a prior IOC failure. |
2722 | */ | 2682 | */ |