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

Commit 616feab7 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

kernel/reboot.c: convert simple_strtoul to kstrtoint 



Replace obsolete function.
kstrtoint is used as reboot_cpu is an integer.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c5a53c6

kernel/reboot.c

+14 −7
Original line number Diff line number Diff line
@@ -388,15 +388,22 @@ static int __init reboot_setup(char *str) 
			break;



		case 's':

			if (isdigit(*(str+1)))

				reboot_cpu = simple_strtoul(str+1, NULL, 0);

			else if (str[1] == 'm' && str[2] == 'p' &&

							isdigit(*(str+3)))

				reboot_cpu = simple_strtoul(str+3, NULL, 0);

			else

		{

			int rc;



			if (isdigit(*(str+1))) {

				rc = kstrtoint(str+1, 0, &reboot_cpu);

				if (rc)

					return rc;

			} else if (str[1] == 'm' && str[2] == 'p' &&

				   isdigit(*(str+3))) {

				rc = kstrtoint(str+3, 0, &reboot_cpu);

				if (rc)

					return rc;

			} else

				reboot_mode = REBOOT_SOFT;

			break;



		}

		case 'g':

			reboot_mode = REBOOT_GPIO;

			break;