From patchwork Tue May 24 22:35:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 68536 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp891889qge; Tue, 24 May 2016 15:38:01 -0700 (PDT) X-Received: by 10.98.109.197 with SMTP id i188mr904873pfc.88.1464129481420; Tue, 24 May 2016 15:38:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c21si1715372pfj.4.2016.05.24.15.38.01; Tue, 24 May 2016 15:38:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753259AbcEXWgL (ORCPT + 30 others); Tue, 24 May 2016 18:36:11 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:32895 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752427AbcEXWgD (ORCPT ); Tue, 24 May 2016 18:36:03 -0400 Received: by mail-pa0-f66.google.com with SMTP id f8so3301859pag.0; Tue, 24 May 2016 15:36:03 -0700 (PDT) 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) Received: from dl.caveonetworks.com ([50.233.148.158]) by smtp.gmail.com with ESMTPSA id m64sm33915157pfc.19.2016.05.24.15.35.58 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 May 2016 15:35:58 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u4OMZv1g019039; Tue, 24 May 2016 15:35:57 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u4OMZvSH019038; Tue, 24 May 2016 15:35:57 -0700 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH v7 01/15] acpi, numa: Use pr_fmt() instead of printk Date: Tue, 24 May 2016 15:35:31 -0700 Message-Id: <1464129345-18985-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> References: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 1.7.11.7 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)