lkml.org 
[lkml]   [2012]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] ACPI: Update CPU hotplug messages
    Date
    Updated CPU hotplug log messages with acpi_pr_<level>(),
    dev_<level>() and pr_<level>(). Some messages are also
    changed for clarity.

    Signed-off-by: Toshi Kani <toshi.kani@hp.com>
    ---
    drivers/acpi/processor_driver.c | 36 +++++++++++++++++++++---------------
    1 files changed, 21 insertions(+), 15 deletions(-)

    diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
    index a6f6bde..40727d9 100644
    --- a/drivers/acpi/processor_driver.c
    +++ b/drivers/acpi/processor_driver.c
    @@ -280,7 +280,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
    /* Declared with "Processor" statement; match ProcessorID */
    status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
    if (ACPI_FAILURE(status)) {
    - printk(KERN_ERR PREFIX "Evaluating processor object\n");
    + acpi_pr_err(pr->handle,
    + "Failed to evaluate processor object (0x%x)\n",
    + status);
    return -ENODEV;
    }

    @@ -299,8 +301,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
    status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
    NULL, &value);
    if (ACPI_FAILURE(status)) {
    - printk(KERN_ERR PREFIX
    - "Evaluating processor _UID [%#x]\n", status);
    + acpi_pr_err(pr->handle,
    + "Failed to evaluate processor _UID (0x%x)\n",
    + status);
    return -ENODEV;
    }
    device_declaration = 1;
    @@ -343,7 +346,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
    if (!object.processor.pblk_address)
    ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));
    else if (object.processor.pblk_length != 6)
    - printk(KERN_ERR PREFIX "Invalid PBLK length [%d]\n",
    + acpi_pr_err(pr->handle, "Invalid PBLK length [%d]\n",
    object.processor.pblk_length);
    else {
    pr->throttling.address = object.processor.pblk_address;
    @@ -430,8 +433,8 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
    struct cpuidle_driver *idle_driver =
    cpuidle_get_driver();

    - printk(KERN_INFO "Will online and init hotplugged "
    - "CPU: %d\n", pr->id);
    + pr_info("Will online and init hotplugged CPU: %d\n",
    + pr->id);
    WARN(acpi_processor_start(pr), "Failed to start CPU:"
    " %d\n", pr->id);
    pr->flags.need_hotplug_init = 0;
    @@ -496,14 +499,16 @@ static __ref int acpi_processor_start(struct acpi_processor *pr)
    &pr->cdev->device.kobj,
    "thermal_cooling");
    if (result) {
    - printk(KERN_ERR PREFIX "Create sysfs link\n");
    + dev_err(&device->dev,
    + "Failed to create sysfs link 'thermal_cooling'\n");
    goto err_thermal_unregister;
    }
    result = sysfs_create_link(&pr->cdev->device.kobj,
    &device->dev.kobj,
    "device");
    if (result) {
    - printk(KERN_ERR PREFIX "Create sysfs link\n");
    + dev_err(&pr->cdev->device,
    + "Failed to create sysfs link 'device'\n");
    goto err_remove_sysfs_thermal;
    }

    @@ -565,8 +570,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
    */
    if (per_cpu(processor_device_array, pr->id) != NULL &&
    per_cpu(processor_device_array, pr->id) != device) {
    - printk(KERN_WARNING "BIOS reported wrong ACPI id "
    - "for the processor\n");
    + pr_warn("BIOS reported wrong ACPI id for the processor\n");
    result = -ENODEV;
    goto err_free_cpumask;
    }
    @@ -720,7 +724,7 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,

    result = acpi_processor_device_add(handle, &device);
    if (result) {
    - pr_err(PREFIX "Unable to add the device\n");
    + acpi_pr_err(handle, "Unable to add the device\n");
    break;
    }

    @@ -732,17 +736,19 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
    "received ACPI_NOTIFY_EJECT_REQUEST\n"));

    if (acpi_bus_get_device(handle, &device)) {
    - pr_err(PREFIX "Device don't exist, dropping EJECT\n");
    + acpi_pr_err(handle,
    + "Device don't exist, dropping EJECT\n");
    break;
    }
    if (!acpi_driver_data(device)) {
    - pr_err(PREFIX "Driver data is NULL, dropping EJECT\n");
    + acpi_pr_err(handle,
    + "Driver data is NULL, dropping EJECT\n");
    break;
    }

    ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
    if (!ej_event) {
    - pr_err(PREFIX "No memory, dropping EJECT\n");
    + acpi_pr_err(handle, "No memory, dropping EJECT\n");
    break;
    }

    @@ -852,7 +858,7 @@ static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
    * and do it when the CPU gets online the first time
    * TBD: Cleanup above functions and try to do this more elegant.
    */
    - printk(KERN_INFO "CPU %d got hotplugged\n", pr->id);
    + pr_info("CPU %d got hotplugged\n", pr->id);
    pr->flags.need_hotplug_init = 1;

    return AE_OK;
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-07-18 23:41    [W:0.032 / U:120.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site