diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_common.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_common.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index 1d25a4230308..0f1c2267c9d7 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c | |||
@@ -647,7 +647,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf) | |||
647 | * Determines the itr/intrl granularities based on the maximum aggregate | 647 | * Determines the itr/intrl granularities based on the maximum aggregate |
648 | * bandwidth according to the device's configuration during power-on. | 648 | * bandwidth according to the device's configuration during power-on. |
649 | */ | 649 | */ |
650 | static enum ice_status ice_get_itr_intrl_gran(struct ice_hw *hw) | 650 | static void ice_get_itr_intrl_gran(struct ice_hw *hw) |
651 | { | 651 | { |
652 | u8 max_agg_bw = (rd32(hw, GL_PWR_MODE_CTL) & | 652 | u8 max_agg_bw = (rd32(hw, GL_PWR_MODE_CTL) & |
653 | GL_PWR_MODE_CTL_CAR_MAX_BW_M) >> | 653 | GL_PWR_MODE_CTL_CAR_MAX_BW_M) >> |
@@ -664,13 +664,7 @@ static enum ice_status ice_get_itr_intrl_gran(struct ice_hw *hw) | |||
664 | hw->itr_gran = ICE_ITR_GRAN_MAX_25; | 664 | hw->itr_gran = ICE_ITR_GRAN_MAX_25; |
665 | hw->intrl_gran = ICE_INTRL_GRAN_MAX_25; | 665 | hw->intrl_gran = ICE_INTRL_GRAN_MAX_25; |
666 | break; | 666 | break; |
667 | default: | ||
668 | ice_debug(hw, ICE_DBG_INIT, | ||
669 | "Failed to determine itr/intrl granularity\n"); | ||
670 | return ICE_ERR_CFG; | ||
671 | } | 667 | } |
672 | |||
673 | return 0; | ||
674 | } | 668 | } |
675 | 669 | ||
676 | /** | 670 | /** |
@@ -697,9 +691,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw) | |||
697 | if (status) | 691 | if (status) |
698 | return status; | 692 | return status; |
699 | 693 | ||
700 | status = ice_get_itr_intrl_gran(hw); | 694 | ice_get_itr_intrl_gran(hw); |
701 | if (status) | ||
702 | return status; | ||
703 | 695 | ||
704 | status = ice_init_all_ctrlq(hw); | 696 | status = ice_init_all_ctrlq(hw); |
705 | if (status) | 697 | if (status) |