From patchwork Sat Nov 26 14:26:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1417 Return-Path: Received: from nm24-vm5.bullet.mail.ukl.yahoo.com (nm24-vm5.bullet.mail.ukl.yahoo.com [217.146.176.179]) by open-mesh.org (Postfix) with SMTP id 899B6600862 for ; Sat, 26 Nov 2011 15:28:24 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.211] by nm24.bullet.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:28:24 -0000 Received: from [77.238.184.57] by tm4.bullet.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:28:24 -0000 Received: from [127.0.0.1] by smtp126.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:28:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1322317704; bh=yp0B2BchKJu+/Ee28XC6NRPPMzcMbPmrDdohTun4wZs=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=jfWmslpDD7NHpr2Kg25fizkVGJ/OaY3yGVSs39CDhb5k7pCMxeryarQMBDauFMeFexqqJw4dy432+Z5uwf45PBD/0pIVruzHd3PHJMFtJz8M1KAWuUbysbAVOV67TxVn62BrLJFJ5BgqOjdTyAp1q7yKIy8hih/h8lYnrDxqomc= X-Yahoo-Newman-Id: 207789.3265.bm@smtp126.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: XbDE_XAVM1laxwhquUoLPD_bZka7zxLItiulPjeIydpCTkC 4FqwuaL51WPHKZYvmN5hjWE5ugyu.2s5LMpABvBgdq07ftzqJYUrGKe6SPvp dEsyWJP9csE5Ax0ptHSL2ZzMNl6_O8xvyyXmqg4yrEaZatlp8alkzoMyiakK lL12L5VH8_39yx3Q_s8OFgVNW2zlDqGb0Q.83vvPz0m.8w0U8Kw6K7IncOSs s9g7Mj1ihfXNTcfTXCS6bPBRS3y8XQ8gervePfp12IrGbulP_GbSFaY5ZCy_ hzV_krPBznYjdgsjM6pK_jb0_WmynKwKTPQCecixVx64kXIHY3dphXADKNFv 05CpSu5KMV6FgTymmelngGOjGn0B.nOYaqXiaaj1xEuCaQE8- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp126.mail.ukl.yahoo.com with SMTP; 26 Nov 2011 14:28:19 +0000 GMT From: Marek Lindner To: davem@davemloft.net Date: Sat, 26 Nov 2011 22:26:45 +0800 Message-Id: <1322317612-7770-4-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322317612-7770-1-git-send-email-lindner_marek@yahoo.de> References: <1322317612-7770-1-git-send-email-lindner_marek@yahoo.de> Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] [PATCH 03/10] batman-adv: Replace obsolete strict_strto with kstrto X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Nov 2011 14:28:24 -0000 From: Sven Eckelmann strict_strto is obsolete since v3.1-rc8-8466-g14acc55 and should be replaced with kstrto. Signed-off-by: Sven Eckelmann --- net/batman-adv/bat_sysfs.c | 4 ++-- net/batman-adv/gateway_common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index b8a7414..c25492f 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -174,7 +174,7 @@ static int store_uint_attr(const char *buff, size_t count, unsigned long uint_val; int ret; - ret = strict_strtoul(buff, 10, &uint_val); + ret = kstrtoul(buff, 10, &uint_val); if (ret) { bat_info(net_dev, "%s: Invalid parameter received: %s\n", @@ -239,7 +239,7 @@ static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr, unsigned long val; int ret, vis_mode_tmp = -1; - ret = strict_strtoul(buff, 10, &val); + ret = kstrtoul(buff, 10, &val); if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) || (strncmp(buff, "client", 6) == 0) || diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 18661af..c4ac7b0 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -97,7 +97,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr = '\0'; } - ret = strict_strtol(buff, 10, &ldown); + ret = kstrtol(buff, 10, &ldown); if (ret) { bat_err(net_dev, "Download speed of gateway mode invalid: %s\n", @@ -122,7 +122,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr = '\0'; } - ret = strict_strtol(slash_ptr + 1, 10, &lup); + ret = kstrtol(slash_ptr + 1, 10, &lup); if (ret) { bat_err(net_dev, "Upload speed of gateway mode invalid: "