Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / net / batman-adv / bat_sysfs.c

diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
index b8a7414c35716ade771f2a18ff2b8e8ffe9ead23..c25492f7d665266897a68d8ac06d9860ca87cbf4 100644 (file)
--- 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) ||