clocksource: clean up parse_pmtmr()

PATCH Applied Dan Carpenter 2 participants 2 messages Oct 20, 2012 – Nov 13, 2012

Subsystems (2)

Kernel janitors Clocksource, clockevent drivers

lore

Share & tools

lore

Dan Carpenter

author

2012-10-20 04:46 UTC #0 lore raw

PATCH 1/1 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]>

drivers/clocksource/acpi_pm.c +8 -9

index 6b5cf02..5d1b926 100644
@@ -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;

John Stultz

Applied

2012-11-13 19:05 UTC #1 lore raw

Quoted 5 lines · Dan Carpenter

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