Path: csiph.com!feeder.erje.net!1.us.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: David Daney Newsgroups: linux.kernel Subject: [PATCH v7 01/15] acpi, numa: Use pr_fmt() instead of printk Date: Wed, 25 May 2016 00:40:01 +0200 Message-ID: References: Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ATCrsvVnJy9fDymMHQ0UpbH6c8XD4eYCALNBDJonQ0I=; b=uzNc5yOEMxptl/3AjfmIScQfYW3+2/vSN/eIMkesxRplWNbh9y7vVhGwZrl6XOCEp1 bdoKxUP6nfXpXT2NUB8BXTOCqtYROc/AsGvbZQNqnoSRuZLJmxj4OwrmvzzGiHFWgr5u SOg18LOZefN/07RujhapdLEDX9TrB87iDGPNxNIe1Z9IWotw1o9tetr4jztQKZzuIFmw rFXz9B8dAMfG2Ao/+GgMCLkDgxNFbMxOoCnyxZffldMCFl/PGmGChyJnTNIVnQ3aMtEq YNzOehsZFR9hx71mXIP/BUSMoDxdH8qHFkCEtT57FCCQqdRf3f0NwVTMN6mDt/YrIjJ0 +cZQ== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ATCrsvVnJy9fDymMHQ0UpbH6c8XD4eYCALNBDJonQ0I=; b=c91wSGQBghyRQJhX7zNkJjEBg/7N18VThltVQ/X7ZRFf3tsGv22z7Qkrs2E8ZUWFOS yiguSErYoUjxfeQbzenU9lqu8IKVu3l6Q7oHGQS7fBjLpxItGw6X9W9CUPNwrg+7ccnT EBvTjwVmvjlVFtw1/EwcmbsSt7ST/wL1G5CjLZZszRHW49UiPJMeH9yJDR/n1gNumeQv 43OUaed6Ri5CxrHzUuO4BCRyXO6fDY8H39jfhruIHcTHxIvEAux7Ggfjc4d0Du33W4hQ hHv3+2zF0fIT5yuzRWAavYEhV40j4nOHfi1XwXywv7P7EKmuBev0XS9QtojPRKg+cBNl P8iQ== X-Gm-Message-State: ALyK8tLmVJnNgm7z/2aB4nu/H26NQJMyv2G/EE/vYHDf1ZUjLeNKXxEN3iTMxdsSQg9wlQ== X-Received: by 10.66.132.37 with SMTP id or5mr870519pab.144.1464129362055; Tue, 24 May 2016 15:36:02 -0700 (PDT) X-Mailer: git-send-email 1.7.11.7 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 71 Organization: linux.* mail to news gateway X-Original-Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney X-Original-Date: Tue, 24 May 2016 15:35:31 -0700 X-Original-Message-ID: <1464129345-18985-2-git-send-email-ddaney.cavm@gmail.com> X-Original-References: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1406473 From: Hanjun Guo Just do some cleanups to replace printk with pr_fmt(). Signed-off-by: Hanjun Guo Signed-off-by: Robert Richter Signed-off-by: David Daney --- 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 d176e0e..bdb7622 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -18,6 +18,9 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * */ + +#define pr_fmt(fmt) "ACPI: " fmt + #include #include #include @@ -28,8 +31,6 @@ #include #include -#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