devlink: Add helper function to validate object handler

Every handler argument validated in two steps, first of which, form
checking, expects identifier is few words separated by slashes.
For device and region handlers just checked if identifier have expected
number of slashes.
Add generic function to do that and make code cleaner & consistent.

Signed-off-by: Dmytro Linkin <dlinkin@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/devlink/devlink.c b/devlink/devlink.c
index 9218576f7503d948e5d968280ec4cc891cc4f928..96a1cf0fcc50a3928dcf853dca6185aa72499924 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -917,6 +917,19 @@ static int strtobool(const char *str, bool *p_val)
        return 0;
 }
 
+static int ident_str_validate(char *str, unsigned int expected)
+{
+       if (!str)
+               return -EINVAL;
+
+       if (get_str_char_count(str, '/') != expected) {
+               pr_err("Wrong identification string format.\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static int __dl_argv_handle(char *str, char **p_bus_name, char **p_dev_name)
 {
        int err;
@@ -932,15 +945,12 @@ static int __dl_argv_handle(char *str, char **p_bus_name, char **p_dev_name)
 static int dl_argv_handle(struct dl *dl, char **p_bus_name, char **p_dev_name)
 {
        char *str = dl_argv_next(dl);
+       int err;
 
-       if (!str) {
+       err = ident_str_validate(str, 1);
+       if (err) {
                pr_err("Devlink identification (\"bus_name/dev_name\") expected\n");
-               return -EINVAL;
-       }
-       if (get_str_char_count(str, '/') != 1) {
-               pr_err("Wrong devlink identification string format.\n");
-               pr_err("Expected \"bus_name/dev_name\".\n");
-               return -EINVAL;
+               return err;
        }
        return __dl_argv_handle(str, p_bus_name, p_dev_name);
 }
@@ -1075,18 +1085,12 @@ static int dl_argv_handle_region(struct dl *dl, char **p_bus_name,
                                        char **p_dev_name, char **p_region)
 {
        char *str = dl_argv_next(dl);
-       unsigned int slash_count;
-
-       if (!str) {
-               pr_err("Expected \"bus_name/dev_name/region\" identification.\n");
-               return -EINVAL;
-       }
+       int err;
 
-       slash_count = get_str_char_count(str, '/');
-       if (slash_count != 2) {
-               pr_err("Wrong region identification string format.\n");
+       err = ident_str_validate(str, 2);
+       if (err) {
                pr_err("Expected \"bus_name/dev_name/region\" identification.\n"".\n");
-               return -EINVAL;
+               return err;
        }
 
        return __dl_argv_handle_region(str, p_bus_name, p_dev_name, p_region);