[Intel-wired-lan] [PATCH linux-next] ice: use string choice helpers

Przemek Kitszel przemyslaw.kitszel at intel.com
Mon Oct 28 09:54:33 UTC 2024


On 10/27/24 15:19, R Sundar wrote:
> Use string choice helpers for better readability.
> 
> Reported-by: kernel test robot <lkp at intel.com>
> Reported-by: Julia Lawall <julia.lawall at inria.fr>
> Closes: https://lore.kernel.org/r/202410121553.SRNFzc2M-lkp@intel.com/
> Signed-off-by: R Sundar <prosunofficial at gmail.com>
> ---

thanks, this indeed covers all "enabled/disabled" cases, so:
Acked-by: Przemek Kitszel <przemyslaw.kitszel at intel.com>

for future submissions for Intel Ethernet drivers please use the
iwl-next (or iwl-net) target trees.

There are also other cases that we could cover ON/OFF etc

> 
> Reported in linux repository.
> 
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
> 
> cocci warnings: (new ones prefixed by >>)
>>> drivers/net/ethernet/intel/ice/ice_ptp_hw.c:396:4-22: opportunity for str_enabled_disabled(dw24 . ts_pll_enable)
>     drivers/net/ethernet/intel/ice/ice_ptp_hw.c:474:4-22: opportunity for str_enabled_disabled(dw24 . ts_pll_enable)
> 
> vim +396 drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> 
> 
>   drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> index da88c6ccfaeb..d8d3395e49c3 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> @@ -393,7 +393,7 @@ static int ice_cfg_cgu_pll_e82x(struct ice_hw *hw,
>   
>   	/* Log the current clock configuration */
>   	ice_debug(hw, ICE_DBG_PTP, "Current CGU configuration -- %s, clk_src %s, clk_freq %s, PLL %s\n",
> -		  dw24.ts_pll_enable ? "enabled" : "disabled",
> +		  str_enabled_disabled(dw24.ts_pll_enable),
>   		  ice_clk_src_str(dw24.time_ref_sel),
>   		  ice_clk_freq_str(dw9.time_ref_freq_sel),
>   		  bwm_lf.plllock_true_lock_cri ? "locked" : "unlocked");

perhaps locked/unlocked could be added into string_choices.h

> @@ -471,7 +471,7 @@ static int ice_cfg_cgu_pll_e82x(struct ice_hw *hw,
>   
>   	/* Log the current clock configuration */
>   	ice_debug(hw, ICE_DBG_PTP, "New CGU configuration -- %s, clk_src %s, clk_freq %s, PLL %s\n",
> -		  dw24.ts_pll_enable ? "enabled" : "disabled",
> +		  str_enabled_disabled(dw24.ts_pll_enable),
>   		  ice_clk_src_str(dw24.time_ref_sel),
>   		  ice_clk_freq_str(dw9.time_ref_freq_sel),
>   		  bwm_lf.plllock_true_lock_cri ? "locked" : "unlocked");
> @@ -548,7 +548,7 @@ static int ice_cfg_cgu_pll_e825c(struct ice_hw *hw,
>   
>   	/* Log the current clock configuration */
>   	ice_debug(hw, ICE_DBG_PTP, "Current CGU configuration -- %s, clk_src %s, clk_freq %s, PLL %s\n",
> -		  dw24.ts_pll_enable ? "enabled" : "disabled",
> +		  str_enabled_disabled(dw24.ts_pll_enable),
>   		  ice_clk_src_str(dw23.time_ref_sel),
>   		  ice_clk_freq_str(dw9.time_ref_freq_sel),
>   		  ro_lock.plllock_true_lock_cri ? "locked" : "unlocked");
> @@ -653,7 +653,7 @@ static int ice_cfg_cgu_pll_e825c(struct ice_hw *hw,
>   
>   	/* Log the current clock configuration */
>   	ice_debug(hw, ICE_DBG_PTP, "New CGU configuration -- %s, clk_src %s, clk_freq %s, PLL %s\n",
> -		  dw24.ts_pll_enable ? "enabled" : "disabled",
> +		  str_enabled_disabled(dw24.ts_pll_enable),
>   		  ice_clk_src_str(dw23.time_ref_sel),
>   		  ice_clk_freq_str(dw9.time_ref_freq_sel),
>   		  ro_lock.plllock_true_lock_cri ? "locked" : "unlocked");



More information about the Intel-wired-lan mailing list