diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-31 17:24:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-03 03:39:46 -0400 |
commit | 27d7f47756f40fb1bc3159e09217f740f5c5b5b1 (patch) | |
tree | c4f2d3368efab3eaf4bb6bca9499a62dd688e131 | |
parent | 67d6bfa6863c8535445e1dcdb3385e3a05cd32a7 (diff) |
net: wireless: replace strict_strtoul() with kstrtoul()
The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/debug.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_debug.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/mesh.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index b37eb8d38811..51cc0fa5cd3e 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c | |||
@@ -69,7 +69,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf, | |||
69 | return -EFAULT; | 69 | return -EFAULT; |
70 | 70 | ||
71 | buf[len] = '\0'; | 71 | buf[len] = '\0'; |
72 | if (strict_strtoul(buf, 0, &mask)) | 72 | if (kstrtoul(buf, 0, &mask)) |
73 | return -EINVAL; | 73 | return -EINVAL; |
74 | 74 | ||
75 | common->debug_mask = mask; | 75 | common->debug_mask = mask; |
@@ -114,7 +114,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use | |||
114 | return -EFAULT; | 114 | return -EFAULT; |
115 | 115 | ||
116 | buf[len] = '\0'; | 116 | buf[len] = '\0'; |
117 | if (strict_strtoul(buf, 0, &mask)) | 117 | if (kstrtoul(buf, 0, &mask)) |
118 | return -EINVAL; | 118 | return -EINVAL; |
119 | 119 | ||
120 | ah->txchainmask = mask; | 120 | ah->txchainmask = mask; |
@@ -157,7 +157,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use | |||
157 | return -EFAULT; | 157 | return -EFAULT; |
158 | 158 | ||
159 | buf[len] = '\0'; | 159 | buf[len] = '\0'; |
160 | if (strict_strtoul(buf, 0, &mask)) | 160 | if (kstrtoul(buf, 0, &mask)) |
161 | return -EINVAL; | 161 | return -EINVAL; |
162 | 162 | ||
163 | ah->rxchainmask = mask; | 163 | ah->rxchainmask = mask; |
@@ -200,7 +200,7 @@ static ssize_t write_file_disable_ani(struct file *file, | |||
200 | return -EFAULT; | 200 | return -EFAULT; |
201 | 201 | ||
202 | buf[len] = '\0'; | 202 | buf[len] = '\0'; |
203 | if (strict_strtoul(buf, 0, &disable_ani)) | 203 | if (kstrtoul(buf, 0, &disable_ani)) |
204 | return -EINVAL; | 204 | return -EINVAL; |
205 | 205 | ||
206 | common->disable_ani = !!disable_ani; | 206 | common->disable_ani = !!disable_ani; |
@@ -253,7 +253,7 @@ static ssize_t write_file_ant_diversity(struct file *file, | |||
253 | goto exit; | 253 | goto exit; |
254 | 254 | ||
255 | buf[len] = '\0'; | 255 | buf[len] = '\0'; |
256 | if (strict_strtoul(buf, 0, &antenna_diversity)) | 256 | if (kstrtoul(buf, 0, &antenna_diversity)) |
257 | return -EINVAL; | 257 | return -EINVAL; |
258 | 258 | ||
259 | common->antenna_diversity = !!antenna_diversity; | 259 | common->antenna_diversity = !!antenna_diversity; |
@@ -1278,7 +1278,7 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf, | |||
1278 | return -EFAULT; | 1278 | return -EFAULT; |
1279 | 1279 | ||
1280 | buf[len] = '\0'; | 1280 | buf[len] = '\0'; |
1281 | if (strict_strtoul(buf, 0, ®idx)) | 1281 | if (kstrtoul(buf, 0, ®idx)) |
1282 | return -EINVAL; | 1282 | return -EINVAL; |
1283 | 1283 | ||
1284 | sc->debug.regidx = regidx; | 1284 | sc->debug.regidx = regidx; |
@@ -1323,7 +1323,7 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf, | |||
1323 | return -EFAULT; | 1323 | return -EFAULT; |
1324 | 1324 | ||
1325 | buf[len] = '\0'; | 1325 | buf[len] = '\0'; |
1326 | if (strict_strtoul(buf, 0, ®val)) | 1326 | if (kstrtoul(buf, 0, ®val)) |
1327 | return -EINVAL; | 1327 | return -EINVAL; |
1328 | 1328 | ||
1329 | ath9k_ps_wakeup(sc); | 1329 | ath9k_ps_wakeup(sc); |
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c index b7611b7bbe43..3c6e4138a95d 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_debug.c +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c | |||
@@ -96,7 +96,7 @@ static ssize_t write_file_dfs(struct file *file, const char __user *user_buf, | |||
96 | return -EFAULT; | 96 | return -EFAULT; |
97 | 97 | ||
98 | buf[len] = '\0'; | 98 | buf[len] = '\0'; |
99 | if (strict_strtoul(buf, 0, &val)) | 99 | if (kstrtoul(buf, 0, &val)) |
100 | return -EINVAL; | 100 | return -EINVAL; |
101 | 101 | ||
102 | if (val == DFS_STATS_RESET_MAGIC) | 102 | if (val == DFS_STATS_RESET_MAGIC) |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c index 87110de577ef..d08ef24e9696 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c | |||
@@ -471,7 +471,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf, | |||
471 | return -EFAULT; | 471 | return -EFAULT; |
472 | 472 | ||
473 | buf[len] = '\0'; | 473 | buf[len] = '\0'; |
474 | if (strict_strtoul(buf, 0, &mask)) | 474 | if (kstrtoul(buf, 0, &mask)) |
475 | return -EINVAL; | 475 | return -EINVAL; |
476 | 476 | ||
477 | common->debug_mask = mask; | 477 | common->debug_mask = mask; |
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index b37a582ccbe7..dce5e8f030b2 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -3119,7 +3119,7 @@ il3945_store_debug_level(struct device *d, struct device_attribute *attr, | |||
3119 | unsigned long val; | 3119 | unsigned long val; |
3120 | int ret; | 3120 | int ret; |
3121 | 3121 | ||
3122 | ret = strict_strtoul(buf, 0, &val); | 3122 | ret = kstrtoul(buf, 0, &val); |
3123 | if (ret) | 3123 | if (ret) |
3124 | IL_INFO("%s is not in hex or decimal form.\n", buf); | 3124 | IL_INFO("%s is not in hex or decimal form.\n", buf); |
3125 | else | 3125 | else |
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 9a95045c97b6..3c4899b7c1ab 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -4567,7 +4567,7 @@ il4965_store_debug_level(struct device *d, struct device_attribute *attr, | |||
4567 | unsigned long val; | 4567 | unsigned long val; |
4568 | int ret; | 4568 | int ret; |
4569 | 4569 | ||
4570 | ret = strict_strtoul(buf, 0, &val); | 4570 | ret = kstrtoul(buf, 0, &val); |
4571 | if (ret) | 4571 | if (ret) |
4572 | IL_ERR("%s is not in hex or decimal form.\n", buf); | 4572 | IL_ERR("%s is not in hex or decimal form.\n", buf); |
4573 | else | 4573 | else |
@@ -4614,7 +4614,7 @@ il4965_store_tx_power(struct device *d, struct device_attribute *attr, | |||
4614 | unsigned long val; | 4614 | unsigned long val; |
4615 | int ret; | 4615 | int ret; |
4616 | 4616 | ||
4617 | ret = strict_strtoul(buf, 10, &val); | 4617 | ret = kstrtoul(buf, 10, &val); |
4618 | if (ret) | 4618 | if (ret) |
4619 | IL_INFO("%s is not in decimal form.\n", buf); | 4619 | IL_INFO("%s is not in decimal form.\n", buf); |
4620 | else { | 4620 | else { |
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c index 3e81264db81e..efae07e05c80 100644 --- a/drivers/net/wireless/libertas/mesh.c +++ b/drivers/net/wireless/libertas/mesh.c | |||
@@ -240,7 +240,7 @@ static ssize_t lbs_prb_rsp_limit_set(struct device *dev, | |||
240 | memset(&mesh_access, 0, sizeof(mesh_access)); | 240 | memset(&mesh_access, 0, sizeof(mesh_access)); |
241 | mesh_access.data[0] = cpu_to_le32(CMD_ACT_SET); | 241 | mesh_access.data[0] = cpu_to_le32(CMD_ACT_SET); |
242 | 242 | ||
243 | if (!strict_strtoul(buf, 10, &retry_limit)) | 243 | if (!kstrtoul(buf, 10, &retry_limit)) |
244 | return -ENOTSUPP; | 244 | return -ENOTSUPP; |
245 | if (retry_limit > 15) | 245 | if (retry_limit > 15) |
246 | return -ENOTSUPP; | 246 | return -ENOTSUPP; |
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index af59dd5718e1..8053f775d392 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -1817,7 +1817,7 @@ static ssize_t rtl_store_debug_level(struct device *d, | |||
1817 | unsigned long val; | 1817 | unsigned long val; |
1818 | int ret; | 1818 | int ret; |
1819 | 1819 | ||
1820 | ret = strict_strtoul(buf, 0, &val); | 1820 | ret = kstrtoul(buf, 0, &val); |
1821 | if (ret) { | 1821 | if (ret) { |
1822 | printk(KERN_DEBUG "%s is not in hex or decimal form.\n", buf); | 1822 | printk(KERN_DEBUG "%s is not in hex or decimal form.\n", buf); |
1823 | } else { | 1823 | } else { |