aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-31 17:18:55 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-03 03:39:46 -0400
commit0672f0ab57dc71958542ac41e5a7ccb6a382a8f3 (patch)
treeb729314765ae3740ba2d26200b71ed56aa223636
parent9a99d4a50cb8ce516adf0f2436138d4c8e6e4535 (diff)
net: can: replace strict_strtoul() with kstrtoul()
The usage of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/can/at91_can.c2
-rw-r--r--drivers/net/can/janz-ican3.c2
-rw-r--r--drivers/net/can/slcan.c2
-rw-r--r--drivers/net/can/softing/softing_main.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 556656661d6b..ce8421ac453a 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1220,7 +1220,7 @@ static ssize_t at91_sysfs_set_mb0_id(struct device *dev,
1220 goto out; 1220 goto out;
1221 } 1221 }
1222 1222
1223 err = strict_strtoul(buf, 0, &can_id); 1223 err = kstrtoul(buf, 0, &can_id);
1224 if (err) { 1224 if (err) {
1225 ret = err; 1225 ret = err;
1226 goto out; 1226 goto out;
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index c4bc1d2e2033..36bd6fa1c7f3 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1734,7 +1734,7 @@ static ssize_t ican3_sysfs_set_term(struct device *dev,
1734 unsigned long enable; 1734 unsigned long enable;
1735 int ret; 1735 int ret;
1736 1736
1737 if (strict_strtoul(buf, 0, &enable)) 1737 if (kstrtoul(buf, 0, &enable))
1738 return -EINVAL; 1738 return -EINVAL;
1739 1739
1740 ret = ican3_set_termination(mod, enable); 1740 ret = ican3_set_termination(mod, enable);
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 06b7e097d36e..874188ba06f7 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -161,7 +161,7 @@ static void slc_bump(struct slcan *sl)
161 161
162 sl->rbuff[dlc_pos] = 0; /* terminate can_id string */ 162 sl->rbuff[dlc_pos] = 0; /* terminate can_id string */
163 163
164 if (strict_strtoul(sl->rbuff+1, 16, &ultmp)) 164 if (kstrtoul(sl->rbuff+1, 16, &ultmp))
165 return; 165 return;
166 166
167 cf.can_id = ultmp; 167 cf.can_id = ultmp;
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 3a2b45601ec2..65eef1eea2e2 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -594,7 +594,7 @@ static ssize_t store_output(struct device *dev, struct device_attribute *attr,
594 unsigned long val; 594 unsigned long val;
595 int ret; 595 int ret;
596 596
597 ret = strict_strtoul(buf, 0, &val); 597 ret = kstrtoul(buf, 0, &val);
598 if (ret < 0) 598 if (ret < 0)
599 return ret; 599 return ret;
600 val &= 0xFF; 600 val &= 0xFF;