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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 E881DC2BBD5 for ; Fri, 18 Dec 2020 11:45:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A04D923A7D for ; Fri, 18 Dec 2020 11:45:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726451AbgLRLpH (ORCPT ); Fri, 18 Dec 2020 06:45:07 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:9465 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726308AbgLRLpG (ORCPT ); Fri, 18 Dec 2020 06:45:06 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Cy6T10hDqzhtJx; Fri, 18 Dec 2020 19:43:49 +0800 (CST) Received: from use12-sp2.huawei.com (10.67.189.174) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Fri, 18 Dec 2020 19:44:13 +0800 From: Xiaoming Ni To: , , , , , , , CC: , Subject: [PATCH 3/4] leds:trigger:ledtrig-activity Replace "panic_detected" with is_be_panic() Date: Fri, 18 Dec 2020 19:44:05 +0800 Message-ID: <20201218114406.61906-4-nixiaoming@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201218114406.61906-1-nixiaoming@huawei.com> References: <20201218114406.61906-1-nixiaoming@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.189.174] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the global variable "panic_detected" with is_be_panic() Signed-off-by: Xiaoming Ni --- drivers/leds/trigger/ledtrig-activity.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-activity.c b/drivers/leds/trigger/ledtrig-activity.c index 14ba7faaed9e..bbacb3dbe341 100644 --- a/drivers/leds/trigger/ledtrig-activity.c +++ b/drivers/leds/trigger/ledtrig-activity.c @@ -17,8 +17,6 @@ #include #include "../leds.h" -static int panic_detected; - struct activity_data { struct timer_list timer; struct led_classdev *led_cdev; @@ -47,7 +45,7 @@ static void led_activity_function(struct timer_list *t) if (test_and_clear_bit(LED_BLINK_BRIGHTNESS_CHANGE, &led_cdev->work_flags)) led_cdev->blink_brightness = led_cdev->new_blink_brightness; - if (unlikely(panic_detected)) { + if (unlikely(is_being_panic())) { /* full brightness in case of panic */ led_set_brightness_nosleep(led_cdev, led_cdev->blink_brightness); return; @@ -226,28 +224,15 @@ static int activity_reboot_notifier(struct notifier_block *nb, return NOTIFY_DONE; } -static int activity_panic_notifier(struct notifier_block *nb, - unsigned long code, void *unused) -{ - panic_detected = 1; - return NOTIFY_DONE; -} - static struct notifier_block activity_reboot_nb = { .notifier_call = activity_reboot_notifier, }; -static struct notifier_block activity_panic_nb = { - .notifier_call = activity_panic_notifier, -}; - static int __init activity_init(void) { int rc = led_trigger_register(&activity_led_trigger); if (!rc) { - atomic_notifier_chain_register(&panic_notifier_list, - &activity_panic_nb); register_reboot_notifier(&activity_reboot_nb); } return rc; @@ -256,8 +241,6 @@ static int __init activity_init(void) static void __exit activity_exit(void) { unregister_reboot_notifier(&activity_reboot_nb); - atomic_notifier_chain_unregister(&panic_notifier_list, - &activity_panic_nb); led_trigger_unregister(&activity_led_trigger); } -- 2.27.0