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: 8961101 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 10264BF440 for ; Wed, 27 Apr 2016 18:09:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2018A2024D for ; Wed, 27 Apr 2016 18:09:23 +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 3CF3320138 for ; Wed, 27 Apr 2016 18:09:22 +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 1avTsX-0007g3-RQ; Wed, 27 Apr 2016 18:08:01 +0000 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1avTsO-0007Zk-GN for linux-arm-kernel@lists.infradead.org; Wed, 27 Apr 2016 18:07:53 +0000 Received: by mail-pa0-x244.google.com with SMTP id vv3so6523164pab.0 for ; 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=JgV3o8hhKoXES9HMFTQ5vCF0MYJdlz3duvDj2Ze3JqZSEsC/YnadK1aTj9NFJ/ynOW qjw86EafMTqiyjk3Y0L7tyX7e9VwKvDNyfIhAJ5q6O9ILPGbebSFUH+2HYAxMOB0PVjL gk3bVVe7WyOhr+l5jHg2WXwmvTPGT4B+iuO0dIhUOpPosvK+tWBYvTGBtmTcGkB/bBpJ nt1WrQIvpZwyDojdwu6Io5ZcincdA5xD5vaEBEcWWZwomfUWQCDXk/pNcyoA+yCRh1Xw FVtXoM9MiP0inqFXZkC11xHByPUF9ZAIUSoF3hpfTc4uMeNV7IOzlwgtVHgBNmLMWbmh MYeQ== X-Gm-Message-State: AOPr4FUmaFQgCIieRUaQcv9AbgRinOC+2p1mcbreFs5OKRLJyDE3epEQUTDE62+xMWIU6w== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160427_110752_595414_CEA87F7D X-CRM114-Status: GOOD ( 14.15 ) 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)