From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A5E6C433DB for ; Thu, 4 Mar 2021 14:14:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4471764F39 for ; Thu, 4 Mar 2021 14:14:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236828AbhCDONj (ORCPT ); Thu, 4 Mar 2021 09:13:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41498 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240653AbhCDONH (ORCPT ); Thu, 4 Mar 2021 09:13:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614867102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Senccpuc1TTEJq53wRUPtgfA6m7/zD3KJgdxFYTizkY=; b=e6J0XQnw5AbA7FRcezH1FvFn90q1Z3j2DlhpFHse2NLKHIv5j86LJSAiAWWJOk3JtytW6m 2fur3S+bijon5BFqmXc/RkWCTRSGr8D9JO4BqRxJz/uiGXW3h6S9PrmeX9rPg3tHoCkrzB r5gMO9xmI/EMawCj7xK3xaSDw0lGIz8= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-ZulZ8PhuMj6XaZ8xe9Oc7Q-1; Thu, 04 Mar 2021 09:11:40 -0500 X-MC-Unique: ZulZ8PhuMj6XaZ8xe9Oc7Q-1 Received: by mail-ej1-f70.google.com with SMTP id 3so12212863ejx.17 for ; Thu, 04 Mar 2021 06:11:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Senccpuc1TTEJq53wRUPtgfA6m7/zD3KJgdxFYTizkY=; b=sNmw2wYndhPyJtYt4C0oyw+0TE3JwwNjsK9D5esdxU12WZCBrJP53XAaB9AU06I3JR XYjxblKHGQbopSGZz7kMZuwObaiExEB6dclhAK5guQB2RZLKgcEZKaQWCSR5Nq+EgZQx Ye01VGvcb9WFBiHcaojCywTIWpUEt1c5yc5/79uu6njUApEzItGWkxQQ4SuE5WKFGVWr M9UysYgJvrdFi05attr6uGqnjOOgzO/QlJAAMjUDdR3u288VmKteAFKscXBoPDEeG87J h32+KxVlAwSQOtke4chf2xiPMW9Y05qSAaQGUL0VgAvNIkEONqMwNt0RXQEY1pDe5pCx t36g== X-Gm-Message-State: AOAM533zwRRLhWNQ19LbhrUNAnMTzYBQWA/DF70V1QeNus712i3L8+ZP 4SeMjJaL31y96mAWKI9DYJ70lP4tsOIgxHVJjUXf3Rvx1lhUSxbIAP8yivJWwpNpa8LHgNDTUgm oKju0XeaADzFxSQ9sCBbMeQ== X-Received: by 2002:a17:906:1fd2:: with SMTP id e18mr4621049ejt.49.1614867099431; Thu, 04 Mar 2021 06:11:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLk6KLql7nlw9YimuS3xza8Ashn9e8ZbujmQsfr6ZM2rBNv06qhUySS/NFIdc1O1ZtOfCgew== X-Received: by 2002:a17:906:1fd2:: with SMTP id e18mr4621027ejt.49.1614867099230; Thu, 04 Mar 2021 06:11:39 -0800 (PST) Received: from x1.localdomain (2001-1c00-0c1e-bf00-1054-9d19-e0f0-8214.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1054:9d19:e0f0:8214]) by smtp.gmail.com with ESMTPSA id a12sm11065943edx.91.2021.03.04.06.11.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Mar 2021 06:11:38 -0800 (PST) Subject: Re: [PATCH v1] platform: x86: ACPI: Get rid of ACPICA message printing To: "Rafael J. Wysocki" , Platform Driver Cc: Linux ACPI , LKML , Hanjun Guo , Chen Yu References: <2074665.VPHYfYaQb6@kreacher> From: Hans de Goede Message-ID: <77955b4c-eca1-afe9-5fbc-ceddc39cb397@redhat.com> Date: Thu, 4 Mar 2021 15:11:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <2074665.VPHYfYaQb6@kreacher> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi, On 2/24/21 7:41 PM, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > A few x86 platform drivers use ACPI_DEBUG_PRINT() or ACPI_EXCEPTION() > for printing messages, but that is questionable, because those macros > belong to ACPICA and they should not be used elsewhere. In addition, > ACPI_DEBUG_PRINT() requires special enabling to allow it to actually > print the message, which is a nuisance, and the _COMPONENT symbol > generally needed for that is not defined in any of the files in > question. > > For this reason, replace the ACPI_DEBUG_PRINT() in lg-laptop.c with > pr_debug() and the one in xo15-ebook.c with acpi_handle_debug() > (with the additional benefit that the source object can be identified > more easily after this change), and replace the ACPI_EXCEPTION() in > acer-wmi.c with pr_warn(). > > Also drop the ACPI_MODULE_NAME() definitions that are only used by > the ACPICA message printing macros from those files and from wmi.c > and surfacepro3_button.c (while at it). > > Signed-off-by: Rafael J. Wysocki Thank you. I've merged this into my review-hans branch now, minus the acer-wmi.c changes because a similar patch was already merged for those. Regards, Hans > --- > drivers/platform/surface/surfacepro3_button.c | 2 -- > drivers/platform/x86/acer-wmi.c | 4 ++-- > drivers/platform/x86/lg-laptop.c | 2 +- > drivers/platform/x86/wmi.c | 1 - > drivers/platform/x86/xo15-ebook.c | 6 ++---- > 5 files changed, 5 insertions(+), 10 deletions(-) > > Index: linux-pm/drivers/platform/x86/lg-laptop.c > =================================================================== > --- linux-pm.orig/drivers/platform/x86/lg-laptop.c > +++ linux-pm/drivers/platform/x86/lg-laptop.c > @@ -678,7 +678,7 @@ static int __init acpi_init(void) > > result = acpi_bus_register_driver(&acpi_driver); > if (result < 0) { > - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error registering driver\n")); > + pr_debug("Error registering driver\n"); > return -ENODEV; > } > > Index: linux-pm/drivers/platform/x86/xo15-ebook.c > =================================================================== > --- linux-pm.orig/drivers/platform/x86/xo15-ebook.c > +++ linux-pm/drivers/platform/x86/xo15-ebook.c > @@ -26,8 +26,6 @@ > #define XO15_EBOOK_HID "XO15EBK" > #define XO15_EBOOK_DEVICE_NAME "EBook Switch" > > -ACPI_MODULE_NAME(MODULE_NAME); > - > MODULE_DESCRIPTION("OLPC XO-1.5 ebook switch driver"); > MODULE_LICENSE("GPL"); > > @@ -66,8 +64,8 @@ static void ebook_switch_notify(struct a > ebook_send_state(device); > break; > default: > - ACPI_DEBUG_PRINT((ACPI_DB_INFO, > - "Unsupported event [0x%x]\n", event)); > + acpi_handle_debug(device->handle, > + "Unsupported event [0x%x]\n", event); > break; > } > } > Index: linux-pm/drivers/platform/x86/acer-wmi.c > =================================================================== > --- linux-pm.orig/drivers/platform/x86/acer-wmi.c > +++ linux-pm/drivers/platform/x86/acer-wmi.c > @@ -30,7 +30,6 @@ > #include > #include > > -ACPI_MODULE_NAME(KBUILD_MODNAME); > MODULE_AUTHOR("Carlos Corbacho"); > MODULE_DESCRIPTION("Acer Laptop WMI Extras Driver"); > MODULE_LICENSE("GPL"); > @@ -1605,7 +1604,8 @@ static void acer_kbd_dock_get_initial_st > > status = wmi_evaluate_method(WMID_GUID3, 0, 0x2, &input_buf, &output_buf); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Error getting keyboard-dock initial status")); > + pr_warn("Error getting keyboard-dock initial status: %s\n", > + acpi_format_exception(status)); > return; > } > > Index: linux-pm/drivers/platform/surface/surfacepro3_button.c > =================================================================== > --- linux-pm.orig/drivers/platform/surface/surfacepro3_button.c > +++ linux-pm/drivers/platform/surface/surfacepro3_button.c > @@ -40,8 +40,6 @@ static const guid_t MSHW0040_DSM_UUID = > #define SURFACE_BUTTON_NOTIFY_PRESS_VOLUME_DOWN 0xc2 > #define SURFACE_BUTTON_NOTIFY_RELEASE_VOLUME_DOWN 0xc3 > > -ACPI_MODULE_NAME("surface pro 3 button"); > - > MODULE_AUTHOR("Chen Yu"); > MODULE_DESCRIPTION("Surface Pro3 Button Driver"); > MODULE_LICENSE("GPL v2"); > Index: linux-pm/drivers/platform/x86/wmi.c > =================================================================== > --- linux-pm.orig/drivers/platform/x86/wmi.c > +++ linux-pm/drivers/platform/x86/wmi.c > @@ -32,7 +32,6 @@ > #include > #include > > -ACPI_MODULE_NAME("wmi"); > MODULE_AUTHOR("Carlos Corbacho"); > MODULE_DESCRIPTION("ACPI-WMI Mapping Driver"); > MODULE_LICENSE("GPL"); > > >