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.8 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 E60AFC433DB for ; Thu, 4 Feb 2021 18:28:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 98B3564F51 for ; Thu, 4 Feb 2021 18:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239104AbhBDS2C (ORCPT ); Thu, 4 Feb 2021 13:28:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47901 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239113AbhBDS1H (ORCPT ); Thu, 4 Feb 2021 13:27:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612463134; 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=1xldkfZkqWfGGk6TArkScHUALBjtnF9wc0SKvfCMMaM=; b=YeV/nEeu/i0nlFYIXUOrH5bY4jxIELLJBnHzEE1/Q34Bp6MhH1hpuA48BwhBvT9+jKSQTF lTnaWq4LPuqCUk/z/Jko81nZuIFWDTj4BE/BLCcwmt28c2Oi+N0z05NhkVkkd7pU98qhkg XoHsodyDxRJz5HFjLHSr4+dCDTXZAk4= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-QghDSG9NNDaDmNcE11Tmhw-1; Thu, 04 Feb 2021 13:25:32 -0500 X-MC-Unique: QghDSG9NNDaDmNcE11Tmhw-1 Received: by mail-ed1-f72.google.com with SMTP id u26so3595154edv.18 for ; Thu, 04 Feb 2021 10:25:31 -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=1xldkfZkqWfGGk6TArkScHUALBjtnF9wc0SKvfCMMaM=; b=gRAUVDDQ9L+B5wdPpqfjIqpMQI6PDBmSmq3/bmbX8Ayq6Y71rUFzRsN9kmq9wXIvYr TKyZy9lzRYyUELTbuNF15F7e4yk7Za47c06aP1N/pYOhcxGTmPTYEajpEBwwqqLaV+wh BY52FItUQJFG1p8JIYZayIwt/23O9w82X7Tyo264YyHmFCLqSs229CRMkoq7uhGrZIu3 1S1cOWI5THobR1IT9GZuGDmmbnU8q1qTy/Qan62r0f9PXFY+vHwffYvIfQ9pNsOHaRTw u3P8DWQrd2oEHxw9z2F6LpYBqmsMNV9T91518hLVap0TjTYu7S+WmHc7uEpId1PP5BaL hK5g== X-Gm-Message-State: AOAM533AIELd4H3iQDyAGq5bjIhX8AMAdqb2jpHvru+rg5rdNlShlnlp mlyzerQOk5en4IYFr0towqeTayaxK774LEslDtH0qY33gS78mtzt8baPr1qnBt5BUCbv/EG+hwR WAcWtdbTASRydsTD1iBscclJo X-Received: by 2002:a17:906:5ac8:: with SMTP id x8mr371577ejs.347.1612463130797; Thu, 04 Feb 2021 10:25:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/zCYJ0KGwPPt4Ohj9Wlhj90xFLRGk/jUWth5vtj8+7OUdv41IsVDNVbAFTKPUHKxuBDh1/Q== X-Received: by 2002:a17:906:5ac8:: with SMTP id x8mr371565ejs.347.1612463130633; Thu, 04 Feb 2021 10:25:30 -0800 (PST) Received: from x1.localdomain (2001-1c00-0c1e-bf00-37a3-353b-be90-1238.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:37a3:353b:be90:1238]) by smtp.gmail.com with ESMTPSA id u17sm2914283edr.0.2021.02.04.10.25.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Feb 2021 10:25:29 -0800 (PST) Subject: Re: [PATCH v3 1/5] ACPI: AC: Clean up printing messages To: "Rafael J. Wysocki" , Linux ACPI Cc: Linux PM , LKML , "Rafael J. Wysocki" , Zhang Rui , Erik Kaneda , Joe Perches , Hanjun Guo References: <2367702.B5bJTmGzJm@kreacher> <1991501.dpTHplkurC@kreacher> <1961054.9MKZ8ejxOh@kreacher> <15677254.uJehtQVoeh@kreacher> From: Hans de Goede Message-ID: <754e838c-b3e3-9759-51f2-5e4022f42e91@redhat.com> Date: Thu, 4 Feb 2021 19:25:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <15677254.uJehtQVoeh@kreacher> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 2/3/21 7:43 PM, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > Replace the ACPI_DEBUG_PRINT() and ACPI_EXCEPTION() instances > in ac.c with acpi_handle_debug() and acpi_handle_info() calls, > respectively, which among other things causes the excessive log > level of the messages previously printed via ACPI_EXCEPTION() to > be increased. > > Drop the _COMPONENT and ACPI_MODULE_NAME() definitions that are not > used any more, drop the no longer needed ACPI_AC_COMPONENT definition > from the headers and update the documentation accordingly. > > While at it, replace the direct printk() invocation with pr_info(), > add a pr_fmt() definition to ac.c and drop the unneeded PREFIX > symbol definition from there. > > Signed-off-by: Rafael J. Wysocki Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > > v2 -> v3: Also add a pr_fmt() definition to ac.c and replace direct > printk() with pr_info (no log level change). > > v1 -> v2: Changelog update. > > --- > Documentation/firmware-guide/acpi/debug.rst | 1 - > drivers/acpi/ac.c | 23 ++++++++++------------- > drivers/acpi/sysfs.c | 1 - > include/acpi/acpi_drivers.h | 1 - > 4 files changed, 10 insertions(+), 16 deletions(-) > > Index: linux-pm/Documentation/firmware-guide/acpi/debug.rst > =================================================================== > --- linux-pm.orig/Documentation/firmware-guide/acpi/debug.rst > +++ linux-pm/Documentation/firmware-guide/acpi/debug.rst > @@ -52,7 +52,6 @@ shows the supported mask values, current > ACPI_CA_DISASSEMBLER 0x00000800 > ACPI_COMPILER 0x00001000 > ACPI_TOOLS 0x00002000 > - ACPI_AC_COMPONENT 0x00020000 > ACPI_BATTERY_COMPONENT 0x00040000 > ACPI_BUTTON_COMPONENT 0x00080000 > ACPI_SBS_COMPONENT 0x00100000 > Index: linux-pm/drivers/acpi/ac.c > =================================================================== > --- linux-pm.orig/drivers/acpi/ac.c > +++ linux-pm/drivers/acpi/ac.c > @@ -6,6 +6,8 @@ > * Copyright (C) 2001, 2002 Paul Diefenbaugh > */ > > +#define pr_fmt(fmt) "ACPI: AC: " fmt > + > #include > #include > #include > @@ -18,8 +20,6 @@ > #include > #include > > -#define PREFIX "ACPI: " > - > #define ACPI_AC_CLASS "ac_adapter" > #define ACPI_AC_DEVICE_NAME "AC Adapter" > #define ACPI_AC_FILE_STATE "state" > @@ -28,9 +28,6 @@ > #define ACPI_AC_STATUS_ONLINE 0x01 > #define ACPI_AC_STATUS_UNKNOWN 0xFF > > -#define _COMPONENT ACPI_AC_COMPONENT > -ACPI_MODULE_NAME("ac"); > - > MODULE_AUTHOR("Paul Diefenbaugh"); > MODULE_DESCRIPTION("ACPI AC Adapter Driver"); > MODULE_LICENSE("GPL"); > @@ -102,8 +99,9 @@ static int acpi_ac_get_state(struct acpi > status = acpi_evaluate_integer(ac->device->handle, "_PSR", NULL, > &ac->state); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, > - "Error reading AC Adapter state")); > + acpi_handle_info(ac->device->handle, > + "Error reading AC Adapter state: %s\n", > + acpi_format_exception(status)); > ac->state = ACPI_AC_STATUS_UNKNOWN; > return -ENODEV; > } > @@ -153,8 +151,8 @@ static void acpi_ac_notify(struct acpi_d > > switch (event) { > default: > - ACPI_DEBUG_PRINT((ACPI_DB_INFO, > - "Unsupported event [0x%x]\n", event)); > + acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n", > + event); > fallthrough; > case ACPI_AC_NOTIFY_STATUS: > case ACPI_NOTIFY_BUS_CHECK: > @@ -278,9 +276,8 @@ static int acpi_ac_add(struct acpi_devic > goto end; > } > > - printk(KERN_INFO PREFIX "%s [%s] (%s)\n", > - acpi_device_name(device), acpi_device_bid(device), > - ac->state ? "on-line" : "off-line"); > + pr_info("%s [%s] (%s)\n", acpi_device_name(device), > + acpi_device_bid(device), ac->state ? "on-line" : "off-line"); > > ac->battery_nb.notifier_call = acpi_ac_battery_notify; > register_acpi_notifier(&ac->battery_nb); > @@ -348,7 +345,7 @@ static int __init acpi_ac_init(void) > for (i = 0; i < ARRAY_SIZE(acpi_ac_blacklist); i++) > if (acpi_dev_present(acpi_ac_blacklist[i].hid, "1", > acpi_ac_blacklist[i].hrv)) { > - pr_info(PREFIX "AC: found native %s PMIC, not loading\n", > + pr_info("found native %s PMIC, not loading\n", > acpi_ac_blacklist[i].hid); > return -ENODEV; > } > Index: linux-pm/drivers/acpi/sysfs.c > =================================================================== > --- linux-pm.orig/drivers/acpi/sysfs.c > +++ linux-pm/drivers/acpi/sysfs.c > @@ -52,7 +52,6 @@ static const struct acpi_dlayer acpi_deb > ACPI_DEBUG_INIT(ACPI_COMPILER), > ACPI_DEBUG_INIT(ACPI_TOOLS), > > - ACPI_DEBUG_INIT(ACPI_AC_COMPONENT), > ACPI_DEBUG_INIT(ACPI_BATTERY_COMPONENT), > ACPI_DEBUG_INIT(ACPI_BUTTON_COMPONENT), > ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT), > Index: linux-pm/include/acpi/acpi_drivers.h > =================================================================== > --- linux-pm.orig/include/acpi/acpi_drivers.h > +++ linux-pm/include/acpi/acpi_drivers.h > @@ -15,7 +15,6 @@ > * Please update drivers/acpi/debug.c and Documentation/firmware-guide/acpi/debug.rst > * if you add to this list. > */ > -#define ACPI_AC_COMPONENT 0x00020000 > #define ACPI_BATTERY_COMPONENT 0x00040000 > #define ACPI_BUTTON_COMPONENT 0x00080000 > #define ACPI_SBS_COMPONENT 0x00100000 > > >