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

clocksource: clean up parse_pmtmr()

Browse source 
I changed the strict_strtoul() to kstrtouint().  That has the check
for UINT_MAX built in to it so the ifdefs can be removed.  Also
I changed a printk() to pr_info().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
Dan Carpenter 2012-10-20 07:46:02 +03:00 • committed by John Stultz
parent a1c2d60889
commit 60e3bf14d4
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/clocksource/acpi_pm.c
View file

@ -233,16 +233,15 @@ fs_initcall(init_acpi_pm_clocksource);
*/ */
static int __init parse_pmtmr(char *arg) static int __init parse_pmtmr(char *arg)
{ {
unsigned long base; unsigned int base;
int ret;
if (strict_strtoul(arg, 16, &base)) ret = kstrtouint(arg, 16, &base);
return -EINVAL; if (ret)
#ifdef CONFIG_X86_64 return ret;
if (base > UINT_MAX)
return -ERANGE; pr_info("PMTMR IOPort override: 0x%04x -> 0x%04x\n", pmtmr_ioport,
#endif base);
printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
pmtmr_ioport, base);
pmtmr_ioport = base; pmtmr_ioport = base;
return 1; return 1;