From patchwork Wed Feb 25 00:36:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: al.stone@linaro.org X-Patchwork-Id: 5876481 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 7A234BF440 for ; Wed, 25 Feb 2015 00:40:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79DAD20251 for ; Wed, 25 Feb 2015 00:40:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E2AF20148 for ; Wed, 25 Feb 2015 00:40:03 +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 1YQPyw-0007HF-7n; Wed, 25 Feb 2015 00:37:42 +0000 Received: from mail-ig0-f179.google.com ([209.85.213.179]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YQPyL-000715-81 for linux-arm-kernel@lists.infradead.org; Wed, 25 Feb 2015 00:37:06 +0000 Received: by mail-ig0-f179.google.com with SMTP id l13so1844767iga.0 for ; Tue, 24 Feb 2015 16:36:43 -0800 (PST) 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=35nP/SdEQcp3nIkNxc6v3bX2w7mePfsvAkhyRQsPtQ8=; b=j3MWG3YmoQ+FtN7i6IKbCoreNgz+KFToOuMU4DNrLPfIfW8PsM3rSRJY8sFZrGFmtD ox87wujxCQUdhtmXEI0u76n5ch5JGqgVKAPtSCaRvDqIiQgqqCsXdXKu4UfASrH3fxY3 vUMtqCHsSYz526MEA8U4fZ0hyU2xvRB26lIfMdrGpBzcJKrceE3eA57gWhrwznE115XR ZXY0KqZEA9YTk+EsW9w9W/OeUrsd1LmkvqijMdvWuemHHknnAtF0rGrSgzBS6KkzlmKC POezjM45lQone0ux8J4d8AAKXFyxl5ZDe2putt7M9T1qJdzu4uiVmAmlgNZME0OPEgbp VsqA== X-Gm-Message-State: ALoCoQlwN52lahn5yjdzp4dAsHSGy9XNuOif3WDuXhBoEjCpRsVe5jnrd6vz6ZPb/1/zpUoxfyIU X-Received: by 10.107.167.3 with SMTP id q3mr1333545ioe.18.1424824603675; Tue, 24 Feb 2015 16:36:43 -0800 (PST) Received: from fidelio.ahs3.com (c-50-134-239-249.hsd1.co.comcast.net. [50.134.239.249]) by mx.google.com with ESMTPSA id d6sm21312437iod.11.2015.02.24.16.36.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 16:36:41 -0800 (PST) From: al.stone@linaro.org To: rjw@rjwysocki.net, lenb@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, robert.moore@intel.com, tony.luck@intel.com, fenghua.yu@intel.com Subject: [PATCH v3 2/9] ACPI: clear up warnings on use of printk reported by checkpatch.pl Date: Tue, 24 Feb 2015 17:36:18 -0700 Message-Id: <1424824585-6405-3-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424824585-6405-1-git-send-email-al.stone@linaro.org> References: <1424824585-6405-1-git-send-email-al.stone@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150224_163705_470247_0E8E7F55 X-CRM114-Status: GOOD ( 15.49 ) X-Spam-Score: -0.7 (/) Cc: linaro-kernel@lists.linaro.org, linux-ia64@vger.kernel.org, linaro-acpi@lists.linaro.org, patches@linaro.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devel@acpica.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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: Al Stone In preparation for later splitting out some of the arch-dependent code from osl.c, clear up all the warnings reported by checkpatch.pl where pr_* should be used instead of printk(KERN_* ...). Signed-off-by: Al Stone --- drivers/acpi/osl.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 1dc3a3b..865317c 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -141,7 +141,7 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported) { if (!strcmp("Linux", interface)) { - printk_once(KERN_NOTICE FW_BUG PREFIX + pr_notice_once(FW_BUG PREFIX "BIOS _OSI(Linux) query %s%s\n", osi_linux.enable ? "honored" : "ignored", osi_linux.cmdline ? " via cmdline" : @@ -230,10 +230,10 @@ void acpi_os_vprintf(const char *fmt, va_list args) if (acpi_in_debugger) { kdb_printf("%s", buffer); } else { - printk(KERN_CONT "%s", buffer); + pr_cont("%s", buffer); } #else - printk(KERN_CONT "%s", buffer); + pr_cont("%s", buffer); #endif } @@ -261,8 +261,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) else if (efi.acpi != EFI_INVALID_TABLE_ADDR) return efi.acpi; else { - printk(KERN_ERR PREFIX - "System description tables not found\n"); + pr_err(PREFIX "System description tables not found\n"); return 0; } } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) { @@ -372,7 +371,7 @@ acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) acpi_size pg_sz; if (phys > ULONG_MAX) { - printk(KERN_ERR PREFIX "Cannot map memory that high\n"); + pr_err(PREFIX "Cannot map memory that high\n"); return NULL; } @@ -546,8 +545,8 @@ acpi_os_predefined_override(const struct acpi_predefined_names *init_val, *new_val = NULL; if (!memcmp(init_val->name, "_OS_", 4) && strlen(acpi_os_name)) { - printk(KERN_INFO PREFIX "Overriding _OS definition to '%s'\n", - acpi_os_name); + pr_info(PREFIX "Overriding _OS definition to '%s'\n", + acpi_os_name); *new_val = acpi_os_name; } @@ -824,15 +823,14 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, return AE_ALREADY_ACQUIRED; if (acpi_gsi_to_irq(gsi, &irq) < 0) { - printk(KERN_ERR PREFIX "SCI (ACPI GSI %d) not registered\n", - gsi); + pr_err(PREFIX "SCI (ACPI GSI %d) not registered\n", gsi); return AE_OK; } acpi_irq_handler = handler; acpi_irq_context = context; if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) { - printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq); + pr_err(PREFIX "SCI (IRQ%d) allocation failed\n", irq); acpi_irq_handler = NULL; return AE_NOT_ACQUIRED; } @@ -1173,8 +1171,7 @@ acpi_status acpi_os_execute(acpi_execute_type type, ret = queue_work_on(0, queue, &dpc->work); if (!ret) { - printk(KERN_ERR PREFIX - "Call to queue_work() failed.\n"); + pr_err(PREFIX "Call to queue_work() failed.\n"); status = AE_ERROR; kfree(dpc); } @@ -1371,7 +1368,7 @@ acpi_status acpi_os_signal(u32 function, void *info) { switch (function) { case ACPI_SIGNAL_FATAL: - printk(KERN_ERR PREFIX "Fatal opcode executed\n"); + pr_err(PREFIX "Fatal opcode executed\n"); break; case ACPI_SIGNAL_BREAKPOINT: /* @@ -1440,7 +1437,7 @@ void __init acpi_osi_setup(char *str) return; if (str == NULL || *str == '\0') { - printk(KERN_INFO PREFIX "_OSI method disabled\n"); + pr_info(PREFIX "_OSI method disabled\n"); acpi_gbl_create_osi_method = FALSE; return; } @@ -1498,7 +1495,7 @@ static void __init acpi_cmdline_osi_linux(unsigned int enable) void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d) { - printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident); + pr_notice(PREFIX "DMI detected: %s\n", d->ident); if (enable == -1) return; @@ -1527,7 +1524,7 @@ static void __init acpi_osi_setup_late(void) status = acpi_update_interfaces(ACPI_DISABLE_ALL_VENDOR_STRINGS); if (ACPI_SUCCESS(status)) - printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors\n"); + pr_info(PREFIX "Disabled all _OSI OS vendors\n"); } for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) { @@ -1540,12 +1537,12 @@ static void __init acpi_osi_setup_late(void) status = acpi_install_interface(str); if (ACPI_SUCCESS(status)) - printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str); + pr_info(PREFIX "Added _OSI(%s)\n", str); } else { status = acpi_remove_interface(str); if (ACPI_SUCCESS(status)) - printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str); + pr_info(PREFIX "Deleted _OSI(%s)\n", str); } } } @@ -1646,12 +1643,8 @@ int acpi_check_resource_conflict(const struct resource *res) if (clash) { if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) - printk(KERN_NOTICE "ACPI: This conflict may" - " cause random problems and system" - " instability\n"); - printk(KERN_INFO "ACPI: If an ACPI driver is available" - " for this device, you should use it instead of" - " the native driver\n"); + pr_notice("ACPI: This conflict may cause random problems and system instability\n"); + pr_info("ACPI: If an ACPI driver is available for this device, you should use it instead of the native driver\n"); } if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT) return -EBUSY; @@ -1810,8 +1803,7 @@ early_param("acpi_no_static_ssdt", acpi_no_static_ssdt_setup); static int __init acpi_disable_return_repair(char *s) { - printk(KERN_NOTICE PREFIX - "ACPI: Predefined validation mechanism disabled\n"); + pr_notice(PREFIX "ACPI: Predefined validation mechanism disabled\n"); acpi_gbl_disable_auto_repair = TRUE; return 1;