On Thu, 2012-07-26 at 13:23 -0600, Bjorn Helgaas wrote:

On Wed, Jul 25, 2012 at 5:12 PM, Toshi Kani [off-list ref] wrote:

quoted

Updated Container hotplug log messages with acpi_pr_<level>()
and pr_<level>().

Signed-off-by: Toshi Kani <redacted>
---
 drivers/acpi/container.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 01a986d..643e962 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c

@@ -99,7 +99,7 @@ static int acpi_container_add(struct acpi_device *device)


        if (!device) {
-               printk(KERN_ERR PREFIX "device is NULL\n");
+               pr_err(PREFIX "device is NULL\n");
                return -EINVAL;
        }

This whole "if (!device)" check and the printk should be deleted.  If
the ACPI core calls .add() with a null acpi_device pointer, it's a
core bug, and it's better to take the oops and get the backtrace.

Agreed. Delete the check.

quoted

@@ -164,7 +164,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_warn("Container driver received %s event\n",
                       (type == ACPI_NOTIFY_BUS_CHECK) ?
                       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");

This message looks dubious.  Receiving this event should be a normal
occurrence, so the message might be useful for debugging, but doesn't
seem like a KERN_WARNING event for the user.

Changed to pr_debug() for now.


Thanks!
-Toshi

quoted

@@ -185,7 +185,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)

                result = container_device_add(&device, handle);
                if (result) {
-                       pr_warn("Failed to add container\n");
+                       acpi_pr_warn(handle, "Failed to add container\n");
                        break;
                }

--

1.7.7.6