From patchwork Sat Jun 1 07:24:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 248062 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6FF582C00B1 for ; Sat, 1 Jun 2013 17:24:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753377Ab3FAHYN (ORCPT ); Sat, 1 Jun 2013 03:24:13 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:60751 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839Ab3FAHYJ (ORCPT ); Sat, 1 Jun 2013 03:24:09 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MNP006A9DVYT2B0@mailout4.samsung.com>; Sat, 01 Jun 2013 16:24:07 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 2E.5E.03969.791A9A15; Sat, 01 Jun 2013 16:24:07 +0900 (KST) X-AuditID: cbfee68f-b7f436d000000f81-06-51a9a1978615 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 85.FB.21068.691A9A15; Sat, 01 Jun 2013 16:24:07 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MNP006U0DW6M460@mmp2.samsung.com>; Sat, 01 Jun 2013 16:24:06 +0900 (KST) From: Jingoo Han To: "'David S. Miller'" Cc: netdev@vger.kernel.org, Jingoo Han , "Luis R. Rodriguez" , 'Jouni Malinen' , Vasanthakumar Thiagarajan , Senthil Balasubramanian , "John W. Linville" , Stanislaw Gruszka , 'Larry Finger' , 'Chaoming Li' , linux-wireless@vger.kernel.org Subject: [PATCH] net: wireless: replace strict_strtoul() with kstrtoul() Date: Sat, 01 Jun 2013 16:24:06 +0900 Message-id: <000f01ce5e99$00617fc0$01247f40$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac5emKx79b97zqj1SjKv7U8Er1b6uw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsVy+t8zA93pC1cGGsy8zWMx78VDVos551tY LC4vvMRq8X+RocXun/NYLd6suMNusbVHwqLhyAt2i2MLxCz2ft3DZLF4zhkWi1VzvzA58Hhs WXmTyWParKOMHoc+HGH1+LHhHaPH+31X2Tz6tqxi9LjyfTWjx+dNcgEcUVw2Kak5mWWpRfp2 CVwZ27c3MBV81a+40tjA2sB4Rb2LkZNDQsBE4uX9GywQtpjEhXvr2boYuTiEBJYxSqxumcgG U9R1cRFUYjqjxLupvxghnF+MEktOrmMHqWITUJP48uUwkM3BISKgKzH/uglIDbPAfWaJ+/93 MIPUCAt4SHydNxOsnkVAVaJ/9k5WEJtXwFLiyK3/zBC2oMSPyffATmIW0JJYv/M4E4QtL7F5 zVtmiIsUJHacfc0IYosI6En8erSREaJGRGLfi3dgx0kI9HJI3HtyHmqZgMS3yYdYQI6TEJCV 2HQAao6kxMEVN1gmMIrNQrJ6FpLVs5CsnoVkxQJGllWMoqkFyQXFSelFxnrFibnFpXnpesn5 uZsYIbHdv4Px7gHrQ4zJQOsnMkuJJucDU0NeSbyhsZmRhamJqbGRuaUZacJK4rxqLdaBQgLp iSWp2ampBalF8UWlOanFhxiZODilGhi7hVY9tbx8a36N/JNUNkN7RvZjnko5XxZtfuN5ol/d UGHV3eNah2N3XHqk02JjvezQk2XHb7Qll215ffFg+Y691ctOLFBdfiW3SLJqsyLzzOxzc6Zs fyPr9zex8pLESq3Knu+/wzuiu5/FLtlqzmatuvzWtDubmQrNZjyoNOjl3ZxZZ/SfOe6CEktx RqKhFnNRcSIAyojnCgMDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLKsWRmVeSWpSXmKPExsVy+t9jQd3pC1cGGnx5x2Yx78VDVos551tY LC4vvMRq8X+RocXun/NYLd6suMNusbVHwqLhyAt2i2MLxCz2ft3DZLF4zhkWi1VzvzA58Hhs WXmTyWParKOMHoc+HGH1+LHhHaPH+31X2Tz6tqxi9LjyfTWjx+dNcgEcUQ2MNhmpiSmpRQqp ecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAxyoplCXmlAKFAhKLi5X0 7TBNCA1x07WAaYzQ9Q0JgusxMkADCesYM7Zvb2Aq+KpfcaWxgbWB8Yp6FyMnh4SAiUTXxUVs ELaYxIV764FsLg4hgemMEu+m/mKEcH4xSiw5uY4dpIpNQE3iy5fDQDYHh4iArsT86yYgNcwC 95kl7v/fwQxSIyzgIfF13kywehYBVYn+2TtZQWxeAUuJI7f+M0PYghI/Jt9jAbGZBbQk1u88 zgRhy0tsXvOWGeIiBYkdZ18zgtgiAnoSvx5tZISoEZHY9+Id4wRGgVlIRs1CMmoWklGzkLQs YGRZxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iRGcOJ5J72Bc1WBxiFGAg1GJh9dgxYpAIdbE suLK3EOMEhzMSiK8KxesDBTiTUmsrEotyo8vKs1JLT7EmAz06URmKdHkfGBSyyuJNzQ2MTOy NDKzMDIxNydNWEmc92CrdaCQQHpiSWp2ampBahHMFiYOTqkGxv7yyN9/7JUzeMr3L30erO8d mXWT44gUn7/TptIsgbj0FwViit8YbmX+NH+euFUmN2rJVz5VboMzF8vD+lV3He2ZF+6+v02G Y96frHXyenHsn225rsfemfxr0zWn/Pv3Lrj8jTw9cetG+ZdNnD5evIvLFxjdr99stWDD5w9m J67+uOYo9XPfXyWW4oxEQy3mouJEAOHJZJNgAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The usage of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used. Signed-off-by: Jingoo Han --- drivers/net/wireless/ath/ath9k/debug.c | 14 +++++++------- drivers/net/wireless/ath/ath9k/dfs_debug.c | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- drivers/net/wireless/iwlegacy/4965-mac.c | 4 ++-- drivers/net/wireless/libertas/mesh.c | 2 +- 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 53c0658..0399c897 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; @@ -1223,7 +1223,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; @@ -1268,7 +1268,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 b7611b7..3c6e413 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 87110de5..d08ef24 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 b37a582..dce5e8f 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 9a95045..3c4899b 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 3e81264..efae07e 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 af59dd5..8053f77 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 {