From patchwork Wed Apr 20 01:40:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8884811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7D05BF29F for ; Wed, 20 Apr 2016 01:43:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF2C92026F for ; Wed, 20 Apr 2016 01:43:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DFDD020260 for ; Wed, 20 Apr 2016 01:43:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ash9I-000181-Ly; Wed, 20 Apr 2016 01:41:48 +0000 Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ash8h-0000ND-7F for linux-arm-kernel@lists.infradead.org; Wed, 20 Apr 2016 01:41:12 +0000 Received: by mail-pf0-x233.google.com with SMTP id c20so12418795pfc.1 for ; Tue, 19 Apr 2016 18:40:50 -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=fYswmTfTqJxGzOekmlno66ZmdkfjmUCVHFQLPB1hx5y+vmzrYEIH4h3EZ/EmKVEoRK /cXezeOGDDDJno76RFfzaKxA3j8uo5nlq5rNKAnJUleq5e9bRnfLlis3Y23lV56oTTtA AhBsjTZLAgAIde67MvewL4kDOo0Zg/h0O4yZQIQp+ponHaqnCGatO5H3fWswMeuiYr1h z4QjwJ6ik5pv7YvUiJzdzPuA1LEOA8JOMxP4zH7Q31moddLL86B7EFFsQbvei/0Y49aT cVmmFNUxABRnhAL36+mIxnM3SxanmpzPPp6brs+OiXp7I5IXB2BY5O7+Px7giFWkOwm+ oQWQ== 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=BtmKm4htKGqiO71WZ3rK/iyx9k25xUVym3yeD1ms3cjRXp2ywcb1HTqGKEP6attaa+ mdA9fBOLAT16am6lGIILSLPj32nrY7/q5ZNTJC0OTBjXp10x/X3Rfdls9O513qO3hzJf p5L7rIdpylOMwjrJ4t2OqL7FdO0TODJD6LegsE/it3WF4kpJW8uihtlgeDbF8Sm58Wfr CNLq0dPq/cKz1XJ8u027CdZ7SFOHGT6HMtObJQ1apytqJ5jcn/wAmRiCEHftpaYNHsCO 7v4JwSzyBsxQ85QKwe+blRAd+yYQphTzSvYgIZknuI+o7NThYBx6qvZI5/3TsSjlNeNw yiaw== X-Gm-Message-State: AOPr4FVqBIDNdMe47iOTkD53dPIIqYY6odgaXGG0QOEF/3fIixa7zsXE+mW1qp0sBtPEEw== X-Received: by 10.98.14.67 with SMTP id w64mr8676415pfi.154.1461116450510; Tue, 19 Apr 2016 18:40:50 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id s26sm93648698pfa.0.2016.04.19.18.40.44 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Apr 2016 18:40:46 -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 u3K1eirD023042; Tue, 19 Apr 2016 18:40:44 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3K1ei1T023041; Tue, 19 Apr 2016 18:40:44 -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 Subject: [PATCH v5 01/14] acpi, numa: Use pr_fmt() instead of printk Date: Tue, 19 Apr 2016 18:40:26 -0700 Message-Id: <1461116439-22991-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461116439-22991-1-git-send-email-ddaney.cavm@gmail.com> References: <1461116439-22991-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160419_184111_408921_983D416E X-CRM114-Status: GOOD ( 14.48 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Richter , linux-kernel@vger.kernel.org, David Daney MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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)