lkml.org 
[lkml]   [2016]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 01/14] acpi, numa: Use pr_fmt() instead of printk
    Date
    From: Hanjun Guo <hanjun.guo@linaro.org>

    Just do some cleanups to replace printk with pr_fmt().

    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
    Signed-off-by: Robert Richter <rrichter@cavium.com>
    Signed-off-by: David Daney <david.daney@cavium.com>
    ---
    drivers/acpi/numa.c | 17 +++++++----------
    1 file changed, 7 insertions(+), 10 deletions(-)

    diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
    index 72b6e9e..4e427fc 100644
    --- a/drivers/acpi/numa.c
    +++ b/drivers/acpi/numa.c
    @@ -18,6 +18,9 @@
    * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    *
    */
    +
    +#define pr_fmt(fmt) "ACPI: " fmt
    +
    #include <linux/module.h>
    #include <linux/init.h>
    #include <linux/kernel.h>
    @@ -28,8 +31,6 @@
    #include <linux/nodemask.h>
    #include <linux/topology.h>

    -#define PREFIX "ACPI: "
    -
    #define ACPI_NUMA 0x80000000
    #define _COMPONENT ACPI_NUMA
    ACPI_MODULE_NAME("numa");
    @@ -187,9 +188,8 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
    #endif /* ACPI_DEBUG_OUTPUT */
    break;
    default:
    - printk(KERN_WARNING PREFIX
    - "Found unsupported SRAT entry (type = 0x%x)\n",
    - header->type);
    + pr_warn("Found unsupported SRAT entry (type = 0x%x)\n",
    + header->type);
    break;
    }
    }
    @@ -222,7 +222,7 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
    struct acpi_table_slit *slit = (struct acpi_table_slit *)table;

    if (!slit_valid(slit)) {
    - printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n");
    + pr_info("SLIT table looks invalid. Not used.\n");
    return -EINVAL;
    }
    acpi_numa_slit_init(slit);
    @@ -233,12 +233,9 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
    void __init __weak
    acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
    {
    - printk(KERN_WARNING PREFIX
    - "Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
    - return;
    + pr_warn("Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
    }

    -
    static int __init
    acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
    const unsigned long end)
    --
    1.7.11.7
    \
     
     \ /
      Last update: 2016-04-20 04:01    [W:4.156 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site