Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be54d77 authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: ISS: avoid simple_strtoul usage



Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 3ade4f81
Loading
Loading
Loading
Loading
+11 −11
Original line number Diff line number Diff line
@@ -612,22 +612,22 @@ static int __init iss_net_setup(char *str)
	struct iss_net_init *new;
	struct list_head *ele;
	char *end;
	int n;
	int rc;
	unsigned n;

	n = simple_strtoul(str, &end, 0);
	if (end == str) {
		printk(ERR "Failed to parse '%s'\n", str);
	end = strchr(str, '=');
	if (!end) {
		printk(ERR "Expected '=' after device number\n");
		return 1;
	}
	if (n < 0) {
		printk(ERR "Device %d is negative\n", n);
	*end = 0;
	rc = kstrtouint(str, 0, &n);
	*end = '=';
	if (rc < 0) {
		printk(ERR "Failed to parse '%s'\n", str);
		return 1;
	}
	str = end;
	if (*str != '=') {
		printk(ERR "Expected '=' after device number\n");
		return 1;
	}

	spin_lock(&devices_lock);

@@ -640,7 +640,7 @@ static int __init iss_net_setup(char *str)
	spin_unlock(&devices_lock);

	if (device && device->index == n) {
		printk(ERR "Device %d already configured\n", n);
		printk(ERR "Device %u already configured\n", n);
		return 1;
	}