diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-05-31 21:24:06 +0000 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-03 00:39:46 -0700 | 
| 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,  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &mask)) +	if (kstrtoul(buf, 0, &mask))  		return -EINVAL;  	common->debug_mask = mask; @@ -114,7 +114,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &mask)) +	if (kstrtoul(buf, 0, &mask))  		return -EINVAL;  	ah->txchainmask = mask; @@ -157,7 +157,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &mask)) +	if (kstrtoul(buf, 0, &mask))  		return -EINVAL;  	ah->rxchainmask = mask; @@ -200,7 +200,7 @@ static ssize_t write_file_disable_ani(struct file *file,  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &disable_ani)) +	if (kstrtoul(buf, 0, &disable_ani))  		return -EINVAL;  	common->disable_ani = !!disable_ani; @@ -253,7 +253,7 @@ static ssize_t write_file_ant_diversity(struct file *file,  		goto exit;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &antenna_diversity)) +	if (kstrtoul(buf, 0, &antenna_diversity))  		return -EINVAL;  	common->antenna_diversity = !!antenna_diversity; @@ -1278,7 +1278,7 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, ®idx)) +	if (kstrtoul(buf, 0, ®idx))  		return -EINVAL;  	sc->debug.regidx = regidx; @@ -1323,7 +1323,7 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf,  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, ®val)) +	if (kstrtoul(buf, 0, ®val))  		return -EINVAL;  	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,  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &val)) +	if (kstrtoul(buf, 0, &val))  		return -EINVAL;  	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,  		return -EFAULT;  	buf[len] = '\0'; -	if (strict_strtoul(buf, 0, &mask)) +	if (kstrtoul(buf, 0, &mask))  		return -EINVAL;  	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,  	unsigned long val;  	int ret; -	ret = strict_strtoul(buf, 0, &val); +	ret = kstrtoul(buf, 0, &val);  	if (ret)  		IL_INFO("%s is not in hex or decimal form.\n", buf);  	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,  	unsigned long val;  	int ret; -	ret = strict_strtoul(buf, 0, &val); +	ret = kstrtoul(buf, 0, &val);  	if (ret)  		IL_ERR("%s is not in hex or decimal form.\n", buf);  	else @@ -4614,7 +4614,7 @@ il4965_store_tx_power(struct device *d, struct device_attribute *attr,  	unsigned long val;  	int ret; -	ret = strict_strtoul(buf, 10, &val); +	ret = kstrtoul(buf, 10, &val);  	if (ret)  		IL_INFO("%s is not in decimal form.\n", buf);  	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,  	memset(&mesh_access, 0, sizeof(mesh_access));  	mesh_access.data[0] = cpu_to_le32(CMD_ACT_SET); -	if (!strict_strtoul(buf, 10, &retry_limit)) +	if (!kstrtoul(buf, 10, &retry_limit))  		return -ENOTSUPP;  	if (retry_limit > 15)  		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,  	unsigned long val;  	int ret; -	ret = strict_strtoul(buf, 0, &val); +	ret = kstrtoul(buf, 0, &val);  	if (ret) {  		printk(KERN_DEBUG "%s is not in hex or decimal form.\n", buf);  	} else { | 
