aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAbhijit Pawar <abhi.c.pawar@gmail.com>2012-12-10 14:30:52 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-11 12:49:53 -0500
commita71258d79e3d05632e90c9f7db5ccf929d276529 (patch)
treee14956b6e9c5b31cb77ece7696e852b0e1f0e543 /net
parenta676847b396a8f6e212419fd4e45a3bd7362aebf (diff)
net: remove obsolete simple_strto<foo>
This patch removes the redundant occurences of simple_strto<foo> Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/netpoll.c1
-rw-r--r--net/mac80211/debugfs_sta.c1
-rw-r--r--net/netfilter/nf_conntrack_core.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 12c129f726f9..3151acf5ec13 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -706,7 +706,6 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
706 *delim = 0; 706 *delim = 0;
707 if (*cur == ' ' || *cur == '\t') 707 if (*cur == ' ' || *cur == '\t')
708 np_info(np, "warning: whitespace is not allowed\n"); 708 np_info(np, "warning: whitespace is not allowed\n");
709 np->remote_port = simple_strtol(cur, NULL, 10);
710 if (kstrtou16(cur, 10, &np->remote_port)) 709 if (kstrtou16(cur, 10, &np->remote_port))
711 goto parse_failed; 710 goto parse_failed;
712 cur = delim; 711 cur = delim;
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 0dedb4bd9623..6fb1168b9f16 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -220,7 +220,6 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu
220 } else 220 } else
221 return -EINVAL; 221 return -EINVAL;
222 222
223 tid = simple_strtoul(buf, NULL, 0);
224 ret = kstrtoul(buf, 0, &tid); 223 ret = kstrtoul(buf, 0, &tid);
225 if (ret) 224 if (ret)
226 return ret; 225 return ret;
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 37d9e628106d..08cdc71d8e87 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1422,7 +1422,6 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
1422 if (!nf_conntrack_htable_size) 1422 if (!nf_conntrack_htable_size)
1423 return param_set_uint(val, kp); 1423 return param_set_uint(val, kp);
1424 1424
1425 hashsize = simple_strtoul(val, NULL, 0);
1426 rc = kstrtouint(val, 0, &hashsize); 1425 rc = kstrtouint(val, 0, &hashsize);
1427 if (rc) 1426 if (rc)
1428 return rc; 1427 return rc;