diff options
author | Josh <joshua.taylor0@gmail.com> | 2012-10-22 19:30:40 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-14 18:16:00 -0500 |
commit | 73d4511a5f1e208399b2f7a058b73578c1977611 (patch) | |
tree | 90c7b6996fe409db1069b63835cc3c0ea889cb57 /drivers/acpi/acpi_pad.c | |
parent | 8ab0ab2570cfc48303e545944f53690a6983a898 (diff) |
ACPI: strict_strtoul() and printk() cleanup in acpi_pad
Replace a few calls to strict_strtoul() in acpi_pad.c with kstrtoul()
and use pr_warn() instead of printk() in the same file.
[rjw: Modified the subject and changelog.]
Signed-off-by: Josh Taylor <joshua.taylor0@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_pad.c')
-rw-r--r-- | drivers/acpi/acpi_pad.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index af4aad6ee2eb..16fa979f7180 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c | |||
@@ -286,7 +286,7 @@ static ssize_t acpi_pad_rrtime_store(struct device *dev, | |||
286 | struct device_attribute *attr, const char *buf, size_t count) | 286 | struct device_attribute *attr, const char *buf, size_t count) |
287 | { | 287 | { |
288 | unsigned long num; | 288 | unsigned long num; |
289 | if (strict_strtoul(buf, 0, &num)) | 289 | if (kstrtoul(buf, 0, &num)) |
290 | return -EINVAL; | 290 | return -EINVAL; |
291 | if (num < 1 || num >= 100) | 291 | if (num < 1 || num >= 100) |
292 | return -EINVAL; | 292 | return -EINVAL; |
@@ -309,7 +309,7 @@ static ssize_t acpi_pad_idlepct_store(struct device *dev, | |||
309 | struct device_attribute *attr, const char *buf, size_t count) | 309 | struct device_attribute *attr, const char *buf, size_t count) |
310 | { | 310 | { |
311 | unsigned long num; | 311 | unsigned long num; |
312 | if (strict_strtoul(buf, 0, &num)) | 312 | if (kstrtoul(buf, 0, &num)) |
313 | return -EINVAL; | 313 | return -EINVAL; |
314 | if (num < 1 || num >= 100) | 314 | if (num < 1 || num >= 100) |
315 | return -EINVAL; | 315 | return -EINVAL; |
@@ -332,7 +332,7 @@ static ssize_t acpi_pad_idlecpus_store(struct device *dev, | |||
332 | struct device_attribute *attr, const char *buf, size_t count) | 332 | struct device_attribute *attr, const char *buf, size_t count) |
333 | { | 333 | { |
334 | unsigned long num; | 334 | unsigned long num; |
335 | if (strict_strtoul(buf, 0, &num)) | 335 | if (kstrtoul(buf, 0, &num)) |
336 | return -EINVAL; | 336 | return -EINVAL; |
337 | mutex_lock(&isolated_cpus_lock); | 337 | mutex_lock(&isolated_cpus_lock); |
338 | acpi_pad_idle_cpus(num); | 338 | acpi_pad_idle_cpus(num); |
@@ -457,7 +457,7 @@ static void acpi_pad_notify(acpi_handle handle, u32 event, | |||
457 | dev_name(&device->dev), event, 0); | 457 | dev_name(&device->dev), event, 0); |
458 | break; | 458 | break; |
459 | default: | 459 | default: |
460 | printk(KERN_WARNING "Unsupported event [0x%x]\n", event); | 460 | pr_warn("Unsupported event [0x%x]\n", event); |
461 | break; | 461 | break; |
462 | } | 462 | } |
463 | } | 463 | } |