Browse Source

batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo>

strict_strto<foo> is obsolete since v3.1-rc8-8466-g14acc55 and should be
replaced with kstrto<foo>.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann 13 years ago
parent
commit
25a92b138d
2 changed files with 4 additions and 4 deletions
  1. 2 2
      net/batman-adv/bat_sysfs.c
  2. 2 2
      net/batman-adv/gateway_common.c

+ 2 - 2
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;
 	unsigned long uint_val;
 	int ret;
 	int ret;
 
 
-	ret = strict_strtoul(buff, 10, &uint_val);
+	ret = kstrtoul(buff, 10, &uint_val);
 	if (ret) {
 	if (ret) {
 		bat_info(net_dev,
 		bat_info(net_dev,
 			 "%s: Invalid parameter received: %s\n",
 			 "%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;
 	unsigned long val;
 	int ret, vis_mode_tmp = -1;
 	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)) ||
 	if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) ||
 	    (strncmp(buff, "client", 6) == 0) ||
 	    (strncmp(buff, "client", 6) == 0) ||

+ 2 - 2
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';
 			*tmp_ptr = '\0';
 	}
 	}
 
 
-	ret = strict_strtol(buff, 10, &ldown);
+	ret = kstrtol(buff, 10, &ldown);
 	if (ret) {
 	if (ret) {
 		bat_err(net_dev,
 		bat_err(net_dev,
 			"Download speed of gateway mode invalid: %s\n",
 			"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';
 				*tmp_ptr = '\0';
 		}
 		}
 
 
-		ret = strict_strtol(slash_ptr + 1, 10, &lup);
+		ret = kstrtol(slash_ptr + 1, 10, &lup);
 		if (ret) {
 		if (ret) {
 			bat_err(net_dev,
 			bat_err(net_dev,
 				"Upload speed of gateway mode invalid: "
 				"Upload speed of gateway mode invalid: "