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

Commit 3d915894 authored by Christoph Jaeger's avatar Christoph Jaeger Committed by Rafael J. Wysocki
Browse files

ACPI: use kstrto*() instead of simple_strto*() 



simple_strto*() are obsolete; use kstrto*() instead. Add proper error
checking.

Signed-off-by: default avatarChristoph Jaeger <christophjaeger@linux.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7171511e

drivers/acpi/battery.c

+4 −1
Original line number Diff line number Diff line
@@ -930,7 +930,10 @@ static ssize_t acpi_battery_write_alarm(struct file *file, 
		goto end;

	}

	alarm_string[count] = '\0';

	battery->alarm = simple_strtol(alarm_string, NULL, 0);

	if (kstrtoint(alarm_string, 0, &battery->alarm)) {

		result = -EINVAL;

		goto end;

	}

	result = acpi_battery_set_alarm(battery);

      end:

	if (!result)

drivers/acpi/osl.c

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ void acpi_os_vprintf(const char *fmt, va_list args) 
static unsigned long acpi_rsdp;

static int __init setup_acpi_rsdp(char *arg)

{

	acpi_rsdp = simple_strtoul(arg, NULL, 16);

	if (kstrtoul(arg, 16, &acpi_rsdp))

		return -EINVAL;

	return 0;

}

early_param("acpi_rsdp", setup_acpi_rsdp);

drivers/acpi/tables.c

+2 −1
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ static int __init acpi_parse_apic_instance(char *str) 
	if (!str)

		return -EINVAL;



	acpi_apic_instance = simple_strtoul(str, NULL, 0);

	if (kstrtoint(str, 0, &acpi_apic_instance))

		return -EINVAL;



	pr_notice("Shall use APIC/MADT table %d\n", acpi_apic_instance);