2012-10-20 04:46:34

by Dan Carpenter

[permalink] [raw]
Subject: [patch] 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 <[email protected]>

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 6b5cf02..5d1b926 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;


2012-11-13 19:11:24

by john stultz

[permalink] [raw]
Subject: Re: [patch] clocksource: clean up parse_pmtmr()

On 10/19/2012 09:46 PM, Dan Carpenter wrote:
> 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 <[email protected]>
Applied. Thanks!
-john