diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2012-10-20 07:46:02 +0300 |
|---|---|---|
| committer |   John Stultz <john.stultz@linaro.org> | 2012-11-13 14:04:50 -0500 |
| commit | 60e3bf14d4e2a9fcc11c2fc33f572bfafa8ece92 (patch) | |
| tree | b93870f564ac75a7b820abdeae540f18a3e78161 /drivers/clocksource/acpi_pm.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-dev-60e3bf14d4e2a9fcc11c2fc33f572bfafa8ece92.tar.xz linux-dev-60e3bf14d4e2a9fcc11c2fc33f572bfafa8ece92.zip | |
clocksource: clean up parse_pmtmr()
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>
Diffstat (limited to 'drivers/clocksource/acpi_pm.c')
| -rw-r--r-- | drivers/clocksource/acpi_pm.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 6b5cf02c35c8..5d1b9268bcaf 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -233,16 +233,15 @@ fs_initcall(init_acpi_pm_clocksource); */ static int __init parse_pmtmr(char *arg) { - unsigned long base; + unsigned int base; + int ret; - if (strict_strtoul(arg, 16, &base)) - return -EINVAL; -#ifdef CONFIG_X86_64 - if (base > UINT_MAX) - return -ERANGE; -#endif - printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n", - pmtmr_ioport, base); + ret = kstrtouint(arg, 16, &base); + if (ret) + return ret; + + pr_info("PMTMR IOPort override: 0x%04x -> 0x%04x\n", pmtmr_ioport, + base); pmtmr_ioport = base; return 1; |