1 files changed, 16 insertions, 11 deletions

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 1f9f7d7d7bc5..811910b50b75 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -92,17 +92,24 @@ static int is_device_present(acpi_handle handle)
         return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
 }
 
+static bool is_container_device(const char *hid)
+{
+        const struct acpi_device_id *container_id;
+
+        for (container_id = container_device_ids;
+             container_id->id[0]; container_id++) {
+                if (!strcmp((char *)container_id->id, hid))
+                        return true;
+        }
+
+        return false;
+}
+
 /*******************************************************************/
 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;
@@ -164,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");
 
@@ -185,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;
                 }
 
@@ -232,10 +239,8 @@ container_walk_namespace_cb(acpi_handle handle,
                 goto end;
         }
 
-        if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") &&
-            strcmp(hid, "PNP0A06")) {
+        if (!is_container_device(hid))
                 goto end;
-        }
 
         switch (*action) {
         case INSTALL_NOTIFY_HANDLER: