From: David Ahern <dsahern@kernel.org>
Date: Thu, 17 Feb 2022 02:08:10 +0000 (-0700)
Subject: devlink: Remove strtouint8_t in favor of get_u8
X-Git-Tag: v5.18.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8fd4d4b8448c1e1dfe56b260af50c191a3f4cdd;p=thirdparty%2Fiproute2.git

devlink: Remove strtouint8_t in favor of get_u8

strtouint8_t duplicates get_u8; remove it.

Signed-off-by: David Ahern <dsahern@kernel.org>
---

diff --git a/devlink/devlink.c b/devlink/devlink.c
index 54570df94..da9f97788 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -857,20 +857,6 @@ static int ifname_map_rev_lookup(struct dl *dl, const char *bus_name,
 	return -ENOENT;
 }
 
-static int strtouint8_t(const char *str, uint8_t *p_val)
-{
-	char *endptr;
-	unsigned long int val;
-
-	val = strtoul(str, &endptr, 10);
-	if (endptr == str || *endptr != '\0')
-		return -EINVAL;
-	if (val > UCHAR_MAX)
-		return -ERANGE;
-	*p_val = val;
-	return 0;
-}
-
 static int strtobool(const char *str, bool *p_val)
 {
 	bool val;
@@ -3123,7 +3109,7 @@ static int cmd_dev_param_set(struct dl *dl)
 						      &val_u32);
 			val_u8 = val_u32;
 		} else {
-			err = strtouint8_t(dl->opts.param_value, &val_u8);
+			err = get_u8(&val_u8, dl->opts.param_value, 10);
 		}
 		if (err)
 			goto err_param_value_parse;
@@ -4385,7 +4371,7 @@ static int cmd_port_param_set(struct dl *dl)
 						      &val_u32);
 			val_u8 = val_u32;
 		} else {
-			err = strtouint8_t(dl->opts.param_value, &val_u8);
+			err = get_u8(&val_u8, dl->opts.param_value, 10);
 		}
 		if (err)
 			goto err_param_value_parse;