Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b5511eb authored by Abhijit Pawar's avatar Abhijit Pawar Committed by David S. Miller
Browse files

net: remove obsolete simple_strto<foo> 



This patch replace the obsolete simple_strto<foo> with kstrto<foo>

Signed-off-by: default avatarAbhijit Pawar <abhi.c.pawar@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 008d4278

net/core/netpoll.c

+4 −1
Original line number Diff line number Diff line
@@ -674,7 +674,8 @@ int netpoll_parse_options(struct netpoll *np, char *opt) 
		if ((delim = strchr(cur, '@')) == NULL)

			goto parse_failed;

		*delim = 0;

		np->local_port = simple_strtol(cur, NULL, 10);

		if (kstrtou16(cur, 10, &np->local_port))

			goto parse_failed;

		cur = delim;

	}

	cur++;
@@ -706,6 +707,8 @@ int netpoll_parse_options(struct netpoll *np, char *opt) 
		if (*cur == ' ' || *cur == '\t')

			np_info(np, "warning: whitespace is not allowed\n");

		np->remote_port = simple_strtol(cur, NULL, 10);

		if (kstrtou16(cur, 10, &np->remote_port))

			goto parse_failed;

		cur = delim;

	}

	cur++;

net/ipv4/netfilter/ipt_CLUSTERIP.c

+7 −2
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input, 
#define PROC_WRITELEN	10

	char buffer[PROC_WRITELEN+1];

	unsigned long nodenum;

	int rc;



	if (size > PROC_WRITELEN)

		return -EIO;
@@ -669,11 +670,15 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input, 
	buffer[size] = 0;



	if (*buffer == '+') {

		nodenum = simple_strtoul(buffer+1, NULL, 10);

		rc = kstrtoul(buffer+1, 10, &nodenum);

		if (rc)

			return rc;

		if (clusterip_add_node(c, nodenum))

			return -ENOMEM;

	} else if (*buffer == '-') {

		nodenum = simple_strtoul(buffer+1, NULL,10);

		rc = kstrtoul(buffer+1, 10, &nodenum);

		if (rc)

			return rc;

		if (clusterip_del_node(c, nodenum))

			return -ENOENT;

	} else

net/mac80211/debugfs_sta.c

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu 
		return -EINVAL;



	tid = simple_strtoul(buf, NULL, 0);

	ret = kstrtoul(buf, 0, &tid);

	if (ret)

		return ret;



	if (tid >= IEEE80211_NUM_TIDS)

		return -EINVAL;

net/netfilter/nf_conntrack_core.c

+4 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ EXPORT_SYMBOL_GPL(nf_ct_alloc_hashtable); 


int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)

{

	int i, bucket;

	int i, bucket, rc;

	unsigned int hashsize, old_size;

	struct hlist_nulls_head *hash, *old_hash;

	struct nf_conntrack_tuple_hash *h;
@@ -1423,6 +1423,9 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) 
		return param_set_uint(val, kp);



	hashsize = simple_strtoul(val, NULL, 0);

	rc = kstrtouint(val, 0, &hashsize);

	if (rc)

		return rc;

	if (!hashsize)

		return -EINVAL;