From de6e07aeeb45cca5436c768ae3e578ec1589f480 Mon Sep 17 00:00:00 2001 From: Toshi Kani Date: Tue, 20 Nov 2012 23:42:29 +0000 Subject: [PATCH] --- yaml --- r: 336696 b: refs/heads/master c: 3d78bd9ef746d6468b1dbb2518b1287092b997b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/container.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 78676ccaf9f6..33427a62ec38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab6c57099db14d64c383e4d0392eab05d013630f +refs/heads/master: 3d78bd9ef746d6468b1dbb2518b1287092b997b5 diff --git a/trunk/drivers/acpi/container.c b/trunk/drivers/acpi/container.c index 69e2d6be910c..811910b50b75 100644 --- a/trunk/drivers/acpi/container.c +++ b/trunk/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; }