ath10k: use size_t for len variables

cleanup to consolidate type used for len variables

Signed-off-by: Amadeusz Sławiński <amadeusz.slawinski@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index c27e7ea38a659d50b9badfa6ecc406a8798b8ad2..5ebe64a6e991d40f3c90b171e3517689760e4d5f 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -351,7 +351,7 @@ void ath10k_core_get_fw_features_str(struct ath10k *ar,
                                     char *buf,
                                     size_t buf_len)
 {
-       unsigned int len = 0;
+       size_t len = 0;
        int i;
 
        for (i = 0; i < ATH10K_FW_FEATURE_COUNT; i++) {

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index d5ff0f4ef5ce39522441b90e8eda250ad105b723..fb0ade3adb07de51d0f952ae63235efbeb4b4d44 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -237,7 +237,7 @@ static ssize_t ath10k_read_wmi_services(struct file *file,
 {
        struct ath10k *ar = file->private_data;
        char *buf;
-       unsigned int len = 0, buf_len = 4096;
+       size_t len = 0, buf_len = 4096;
        const char *name;
        ssize_t ret_cnt;
        bool enabled;
@@ -529,7 +529,7 @@ static ssize_t ath10k_fw_stats_read(struct file *file, char __user *user_buf,
                                    size_t count, loff_t *ppos)
 {
        const char *buf = file->private_data;
-       unsigned int len = strlen(buf);
+       size_t len = strlen(buf);
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
@@ -547,17 +547,16 @@ static ssize_t ath10k_debug_fw_reset_stats_read(struct file *file,
                                                size_t count, loff_t *ppos)
 {
        struct ath10k *ar = file->private_data;
-       int ret, len, buf_len;
+       int ret;
+       size_t len = 0, buf_len = 500;
        char *buf;
 
-       buf_len = 500;
        buf = kmalloc(buf_len, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
 
        spin_lock_bh(&ar->data_lock);
 
-       len = 0;
        len += scnprintf(buf + len, buf_len - len,
                         "fw_crash_counter\t\t%d\n", ar->stats.fw_crash_counter);
        len += scnprintf(buf + len, buf_len - len,
@@ -696,7 +695,7 @@ static ssize_t ath10k_read_chip_id(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
 {
        struct ath10k *ar = file->private_data;
-       unsigned int len;
+       size_t len;
        char buf[50];
 
        len = scnprintf(buf, sizeof(buf), "0x%08x\n", ar->chip_id);
@@ -733,8 +732,8 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar,
        struct ath10k_ce_crash_hdr *ce_hdr;
        struct ath10k_dump_file_data *dump_data;
        struct ath10k_tlv_dump_data *dump_tlv;
-       int hdr_len = sizeof(*dump_data);
-       unsigned int len, sofar = 0;
+       size_t hdr_len = sizeof(*dump_data);
+       size_t len, sofar = 0;
        unsigned char *buf;
 
        len = hdr_len;
@@ -900,7 +899,7 @@ static ssize_t ath10k_reg_addr_read(struct file *file,
 {
        struct ath10k *ar = file->private_data;
        u8 buf[32];
-       unsigned int len = 0;
+       size_t len = 0;
        u32 reg_addr;
 
        mutex_lock(&ar->conf_mutex);
@@ -948,7 +947,7 @@ static ssize_t ath10k_reg_value_read(struct file *file,
 {
        struct ath10k *ar = file->private_data;
        u8 buf[48];
-       unsigned int len;
+       size_t len;
        u32 reg_addr, reg_val;
        int ret;
 
@@ -1171,7 +1170,7 @@ static ssize_t ath10k_read_htt_stats_mask(struct file *file,
 {
        struct ath10k *ar = file->private_data;
        char buf[32];
-       unsigned int len;
+       size_t len;
 
        len = scnprintf(buf, sizeof(buf), "%lu\n", ar->debug.htt_stats_mask);
 
@@ -1225,7 +1224,7 @@ static ssize_t ath10k_read_htt_max_amsdu_ampdu(struct file *file,
        struct ath10k *ar = file->private_data;
        char buf[64];
        u8 amsdu, ampdu;
-       unsigned int len;
+       size_t len;
 
        mutex_lock(&ar->conf_mutex);
 
@@ -1285,7 +1284,7 @@ static ssize_t ath10k_read_fw_dbglog(struct file *file,
                                     size_t count, loff_t *ppos)
 {
        struct ath10k *ar = file->private_data;
-       unsigned int len;
+       size_t len;
        char buf[96];
 
        len = scnprintf(buf, sizeof(buf), "0x%16llx %u\n",
@@ -1611,11 +1610,10 @@ static ssize_t ath10k_read_ani_enable(struct file *file, char __user *user_buf,
                                      size_t count, loff_t *ppos)
 {
        struct ath10k *ar = file->private_data;
-       int len = 0;
+       size_t len;
        char buf[32];
 
-       len = scnprintf(buf, sizeof(buf) - len, "%d\n",
-                       ar->ani_enabled);
+       len = scnprintf(buf, sizeof(buf), "%d\n", ar->ani_enabled);
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
@@ -1640,11 +1638,10 @@ static ssize_t ath10k_read_nf_cal_period(struct file *file,
                                         size_t count, loff_t *ppos)
 {
        struct ath10k *ar = file->private_data;
-       unsigned int len;
+       size_t len;
        char buf[32];
 
-       len = scnprintf(buf, sizeof(buf), "%d\n",
-                       ar->debug.nf_cal_period);
+       len = scnprintf(buf, sizeof(buf), "%d\n", ar->debug.nf_cal_period);
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
@@ -1740,9 +1737,10 @@ void ath10k_debug_tpc_stats_process(struct ath10k *ar,
 }
 
 static void ath10k_tpc_stats_print(struct ath10k_tpc_stats *tpc_stats,
-                                  unsigned int j, char *buf, unsigned int *len)
+                                  unsigned int j, char *buf, size_t *len)
 {
-       unsigned int i, buf_len;
+       int i;
+       size_t buf_len;
        static const char table_str[][5] = { "CDD",
                                             "STBC",
                                             "TXBF" };
@@ -1782,7 +1780,8 @@ static void ath10k_tpc_stats_fill(struct ath10k *ar,
                                  struct ath10k_tpc_stats *tpc_stats,
                                  char *buf)
 {
-       unsigned int len, j, buf_len;
+       int j;
+       size_t len, buf_len;
 
        len = 0;
        buf_len = ATH10K_TPC_CONFIG_BUF_SIZE;
@@ -1916,7 +1915,7 @@ static ssize_t ath10k_tpc_stats_read(struct file *file, char __user *user_buf,
                                     size_t count, loff_t *ppos)
 {
        const char *buf = file->private_data;
-       unsigned int len = strlen(buf);
+       size_t len = strlen(buf);
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
@@ -2340,7 +2339,7 @@ static ssize_t ath10k_debug_fw_checksums_read(struct file *file,
                                              size_t count, loff_t *ppos)
 {
        struct ath10k *ar = file->private_data;
-       unsigned int len = 0, buf_len = 4096;
+       size_t len = 0, buf_len = 4096;
        ssize_t ret_cnt;
        char *buf;
 
@@ -2556,7 +2555,7 @@ void ath10k_dbg_dump(struct ath10k *ar,
                     const void *buf, size_t len)
 {
        char linebuf[256];
-       unsigned int linebuflen;
+       size_t linebuflen;
        const void *ptr;
 
        if (ath10k_debug_mask & mask) {

diff --git a/drivers/net/wireless/ath/ath10k/spectral.c b/drivers/net/wireless/ath/ath10k/spectral.c
index 2ffc1fe4923b9696441b4411428ba5548a231783..c061d6958bd130f7d5756d6eaea6268397dd764e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/spectral.c
+++ b/drivers/net/wireless/ath/ath10k/spectral.c
@@ -278,7 +278,7 @@ static ssize_t read_file_spec_scan_ctl(struct file *file, char __user *user_buf,
 {
        struct ath10k *ar = file->private_data;
        char *mode = "";
-       unsigned int len;
+       size_t len;
        enum ath10k_spectral_mode spectral_mode;
 
        mutex_lock(&ar->conf_mutex);
@@ -370,7 +370,7 @@ static ssize_t read_file_spectral_count(struct file *file,
 {
        struct ath10k *ar = file->private_data;
        char buf[32];
-       unsigned int len;
+       size_t len;
        u8 spectral_count;
 
        mutex_lock(&ar->conf_mutex);
@@ -422,7 +422,8 @@ static ssize_t read_file_spectral_bins(struct file *file,
 {
        struct ath10k *ar = file->private_data;
        char buf[32];
-       unsigned int len, bins, fft_size, bin_scale;
+       unsigned int bins, fft_size, bin_scale;
+       size_t len;
 
        mutex_lock(&ar->conf_mutex);