ath10k: fix recently introduced checkpatch warning

I updated my checkpatch and saw new warnings:

drivers/net/wireless/ath/ath10k/qmi.c:593: Prefer strscpy over strlcpy - see: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
drivers/net/wireless/ath/ath10k/qmi.c:598: Prefer strscpy over strlcpy - see: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
drivers/net/wireless/ath/ath10k/htt_rx.c:3565: Integer promotion: Using 'h' in '%04hx' is unnecessary

Compile tested only.

Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220606142957.23721-1-kvalo@kernel.org

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index e8727c0..b846150 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3563,7 +3563,7 @@ static void ath10k_htt_rx_tx_mode_switch_ind(struct ath10k *ar,
        threshold = MS(info1, HTT_TX_MODE_SWITCH_IND_INFO1_THRESHOLD);
 
        ath10k_dbg(ar, ATH10K_DBG_HTT,
-                  "htt rx tx mode switch ind info0 0x%04hx info1 0x%04x enable %d num records %zd mode %d threshold %u\n",
+                  "htt rx tx mode switch ind info0 0x%04x info1 0x%04x enable %d num records %zd mode %d threshold %u\n",
                   info0, info1, enable, num_records, mode, threshold);
 
        len += sizeof(resp->tx_mode_switch_ind.records[0]) * num_records;

diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 80fcb91..d7e4069 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -590,12 +590,12 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)
 
        if (resp->fw_version_info_valid) {
                qmi->fw_version = resp->fw_version_info.fw_version;
-               strlcpy(qmi->fw_build_timestamp, resp->fw_version_info.fw_build_timestamp,
+               strscpy(qmi->fw_build_timestamp, resp->fw_version_info.fw_build_timestamp,
                        sizeof(qmi->fw_build_timestamp));
        }
 
        if (resp->fw_build_id_valid)
-               strlcpy(qmi->fw_build_id, resp->fw_build_id,
+               strscpy(qmi->fw_build_id, resp->fw_build_id,
                        MAX_BUILD_ID_LEN + 1);
 
        if (!test_bit(ATH10K_SNOC_FLAG_REGISTERED, &ar_snoc->flags)) {