From patchwork Wed Apr 27 18:07:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8960991 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 66A539F1C1 for ; Wed, 27 Apr 2016 18:07:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96EA92015A for ; Wed, 27 Apr 2016 18:07:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6037C2026C for ; Wed, 27 Apr 2016 18:07:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753164AbcD0SHf (ORCPT ); Wed, 27 Apr 2016 14:07:35 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35591 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752725AbcD0SHd (ORCPT ); Wed, 27 Apr 2016 14:07:33 -0400 Received: by mail-pa0-f66.google.com with SMTP id zy2so6619514pac.2; Wed, 27 Apr 2016 11:07:32 -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=KS0+xTfz6ESl2VjhoM+AHGc3LJ+YC131+1GnlhMMTlY=; b=o1DxkdCgXN8bY5QZ9gFxloNC+QvVMyTDXL0JOp54Bp2qDVF6gZ875ZO6w1czuwbSx+ K0ydIP+5HUNocdC0rw+PxVCD+qg3Gzl2oal159IcOqMFwRf/Nn5fHBEU2L3hFOhjmFPL W/dA2JZykz+4tfTxvxlxH5454FWD9idGKGChYq6Rpc/uxvYXhu9os+/M1PfgEiQQ6Wlx BHnNa+7YEr9YgUr8DLtO5+jb3b53vdPIGS2yN1vTfoq9VuRpSipuyg4aSgRWoTPB+GKf +aa4UQ51Kow6Libs5P/34DwtOXOW5ey3dd64HboE+UnrvIkg8xcNfevqTG1MXyxncKOk Iptg== 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=KS0+xTfz6ESl2VjhoM+AHGc3LJ+YC131+1GnlhMMTlY=; b=C1lPtXnYfw67L7PqQYewKHFL3vBUyQmA2ivj8fSTJV0MBAgG2zqfHI8N7PFj0D7ket 1WqyPeZ34ckAA4VuAyOC77uWGV2UoH3zKD9BXn9MvFXdw8NEquvr0zHo15IzCVcwQPdA Io4LmBhrgLMTJvNVnLPqf0k9Jm9QqgMRiFeYNGXNVJ8NODfTsowSN9ms1Quv6oncicIH UtRgsGMprdNRXRNhex/3AGes4xmDnkDEp+BXEzd4GY+u0fuonkkBA51vpeKBqt/xEBls lBa7iSdPoH2G6y+IVoUG34oYv+9emAU2MRGDWgql4Q5jTAFiWSHxBI9Y06SfYFQnXgBi 11qQ== X-Gm-Message-State: AOPr4FU2OdmGq9wWC3t5Ve+Oepdw6DOL0S1D7qyY5Jrd2HKxE1Cslx/mtm/eC+IASgYTmw== X-Received: by 10.66.21.102 with SMTP id u6mr10626598pae.118.1461780452349; Wed, 27 Apr 2016 11:07:32 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id t8sm8474793paw.16.2016.04.27.11.07.29 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Apr 2016 11:07:29 -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 u3RI7SmR027235; Wed, 27 Apr 2016 11:07:28 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3RI7SNv027234; Wed, 27 Apr 2016 11:07:28 -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 v6 01/14] acpi, numa: Use pr_fmt() instead of printk Date: Wed, 27 Apr 2016 11:07:03 -0700 Message-Id: <1461780436-27182-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> References: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 72b6e9e..4e427fc 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)