[PATCH 4/6] ice: use string choice helpers

[Dmitry Antipov]

Prefer 'str_locked_unlocked()', 'str_on_off()' and 'str_true_false()'
string choice helpers over hardcoded strings where appropriate.

Signed-off-by: Dmitry Antipov <dmantipov@xxxxxxxxx>
---
 drivers/net/ethernet/intel/ice/ice.h           | 1 +
 drivers/net/ethernet/intel/ice/ice_sriov.c     | 6 ++----
 drivers/net/ethernet/intel/ice/ice_switch.c    | 2 +-
 drivers/net/ethernet/intel/ice/ice_tspll.c     | 2 +-
 drivers/net/ethernet/intel/ice/ice_vlan_mode.c | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index fc91b6665f90..fde1a9d30ad0 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -35,6 +35,7 @@
 #include <linux/linkmode.h>
 #include <linux/bpf.h>
 #include <linux/btf.h>
+#include <linux/string_choices.h>
 #include <linux/auxiliary_bus.h>
 #include <linux/avf/virtchnl.h>
 #include <linux/cpu_rmap.h>
diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index e04de0215596..068c1af16514 100644
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -1750,8 +1750,7 @@ void ice_print_vf_rx_mdd_event(struct ice_vf *vf)
 	dev_info(dev, "%d Rx Malicious Driver Detection events detected on PF %d VF %d MAC %pM. mdd-auto-reset-vfs=%s\n",
 		 vf->mdd_rx_events.count, pf->hw.pf_id, vf->vf_id,
 		 vf->dev_lan_addr,
-		 test_bit(ICE_FLAG_MDD_AUTO_RESET_VF, pf->flags)
-			  ? "on" : "off");
+		 str_on_off(test_bit(ICE_FLAG_MDD_AUTO_RESET_VF, pf->flags)));
 }
 
 /**
@@ -1768,8 +1767,7 @@ void ice_print_vf_tx_mdd_event(struct ice_vf *vf)
 	dev_info(dev, "%d Tx Malicious Driver Detection events detected on PF %d VF %d MAC %pM. mdd-auto-reset-vfs=%s\n",
 		 vf->mdd_tx_events.count, pf->hw.pf_id, vf->vf_id,
 		 vf->dev_lan_addr,
-		 test_bit(ICE_FLAG_MDD_AUTO_RESET_VF, pf->flags)
-			  ? "on" : "off");
+		 str_on_off(test_bit(ICE_FLAG_MDD_AUTO_RESET_VF, pf->flags)));
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 6a5875bd9c6b..8447fdec3b7c 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -2098,7 +2098,7 @@ ice_update_recipe_lkup_idx(struct ice_hw *hw,
 	if (status)
 		ice_debug(hw, ICE_DBG_SW, "Failed to update recipe %d lkup_idx %d fv_idx %d mask %d mask_valid %s, status %d\n",
 			  params->rid, params->lkup_idx, params->fv_idx,
-			  params->mask, params->mask_valid ? "true" : "false",
+			  params->mask, str_true_false(params->mask_valid),
 			  status);
 
 error_out:
diff --git a/drivers/net/ethernet/intel/ice/ice_tspll.c b/drivers/net/ethernet/intel/ice/ice_tspll.c
index fd4b58eb9bc0..8270960eed1c 100644
--- a/drivers/net/ethernet/intel/ice/ice_tspll.c
+++ b/drivers/net/ethernet/intel/ice/ice_tspll.c
@@ -158,7 +158,7 @@ static void ice_tspll_log_cfg(struct ice_hw *hw, bool enable, u8 clk_src,
 		new_cfg ? "New" : "Current", str_enabled_disabled(enable),
 		ice_tspll_clk_src_str((enum ice_clk_src)clk_src),
 		ice_tspll_clk_freq_str((enum ice_tspll_freq)tspll_freq),
-		lock ? "locked" : "unlocked");
+		str_locked_unlocked(lock));
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/ice/ice_vlan_mode.c b/drivers/net/ethernet/intel/ice/ice_vlan_mode.c
index fb526cb84776..5f4c60eefc10 100644
--- a/drivers/net/ethernet/intel/ice/ice_vlan_mode.c
+++ b/drivers/net/ethernet/intel/ice/ice_vlan_mode.c
@@ -254,7 +254,7 @@ static int ice_dvm_update_dflt_recipes(struct ice_hw *hw)
 		if (status) {
 			ice_debug(hw, ICE_DBG_INIT, "Failed to update RID %d lkup_idx %d fv_idx %d mask_valid %s mask 0x%04x\n",
 				  params->rid, params->lkup_idx, params->fv_idx,
-				  params->mask_valid ? "true" : "false",
+				  str_true_false(params->mask_valid),
 				  params->mask);
 			return status;
 		}
-- 
2.55.0