diff options
| author | Toshi Kani <toshi.kani@hp.com> | 2012-11-20 23:42:29 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-21 23:20:23 +0100 |
| commit | 3d78bd9ef746d6468b1dbb2518b1287092b997b5 (patch) | |
| tree | 85099c34a054b7f6564ed638dbac6e45efa95a64 | |
| parent | ab6c57099db14d64c383e4d0392eab05d013630f (diff) | |
| download | linux-3d78bd9ef746d6468b1dbb2518b1287092b997b5.tar.gz linux-3d78bd9ef746d6468b1dbb2518b1287092b997b5.tar.bz2 linux-3d78bd9ef746d6468b1dbb2518b1287092b997b5.zip | |
ACPI: Update Container hotplug error messages
Updated Container hotplug error messages with acpi_handle_<level>()
and pr_<level>(). Removed an unnecessary check to the device arg
in acpi_container_add().
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/container.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 69e2d6be910c..811910b50b75 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -110,12 +110,6 @@ static int acpi_container_add(struct acpi_device *device) { struct acpi_container *container; - - if (!device) { - printk(KERN_ERR PREFIX "device is NULL\n"); - return -EINVAL; - } - container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL); if (!container) return -ENOMEM; @@ -177,7 +171,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) case ACPI_NOTIFY_BUS_CHECK: /* Fall through */ case ACPI_NOTIFY_DEVICE_CHECK: - printk(KERN_WARNING "Container driver received %s event\n", + pr_debug("Container driver received %s event\n", (type == ACPI_NOTIFY_BUS_CHECK) ? "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"); @@ -198,7 +192,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) result = container_device_add(&device, handle); if (result) { - printk(KERN_WARNING "Failed to add container\n"); + acpi_handle_warn(handle, "Failed to add container\n"); break; } |