evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Christoph Jaeger <christophjaeger@linux.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Christoph Jaeger 2014-06-13 21:49:58 +02:00 • committed by Rafael J. Wysocki
parent 7171511eae
commit 3d915894f8
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/acpi/battery.c
View file

@ -930,7 +930,10 @@ static ssize_t acpi_battery_write_alarm(struct file *file,
goto end; goto end;
} }
alarm_string[count] = '\0'; 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); result = acpi_battery_set_alarm(battery);
end: end:
if (!result) if (!result)

3
drivers/acpi/osl.c
View file

@ -235,7 +235,8 @@ void acpi_os_vprintf(const char *fmt, va_list args)
static unsigned long acpi_rsdp; static unsigned long acpi_rsdp;
static int __init setup_acpi_rsdp(char *arg) 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; return 0;
} }
early_param("acpi_rsdp", setup_acpi_rsdp); early_param("acpi_rsdp", setup_acpi_rsdp);

3
drivers/acpi/tables.c
View file

@ -360,7 +360,8 @@ static int __init acpi_parse_apic_instance(char *str)
if (!str) if (!str)
return -EINVAL; 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); pr_notice("Shall use APIC/MADT table %d\n", acpi_apic_instance);