From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender6-op-o12.zoho.com (sender6-op-o12.zoho.com [165.173.180.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14AD749550F; Tue, 1 Sep 2026 18:12:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=165.173.180.12 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788286326; cv=pass; b=OSNw1tMreYcYuHzpwedV4vtQBeoV3wFOtvxiWSaXSjlkd9Ce4ENdpwF5TPfziMk/CSNMCLEWI7pFnRBRM72cdvgYgHgPn85mrerl9JwWSK7OY42Er7eQDYNex3Swdta0bPg16CIt13NUZ/6C/s9mzuqiZ+pW9pmhaaSGv+GD3W8= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788286326; c=relaxed/simple; bh=7ZAsoBjFbWKnWetAs9AfEUvhkJPFN0slytnXiKl2zDQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SzaHzN7w8mNrinzmxgvtx0Izwi2sHyu6ItsDr76xiyt+8IBahJCfSHVzaayOCjhX5Y1FCLF9jv4Y3zOLIhc6bqbruDNq0GSQTPIDSxHp0H4fYNUrCNDYLx7RtH4xqz9b1OglAyQ69QizVot7W/xrXD3f+sxbgQJkvWahT9uDKJU= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=rong.moe; spf=pass smtp.mailfrom=rong.moe; dkim=pass (2048-bit key) header.d=rong.moe header.i=i@rong.moe header.b=bkLsu7uv; arc=pass smtp.client-ip=165.173.180.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=rong.moe Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rong.moe Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rong.moe header.i=i@rong.moe header.b="bkLsu7uv" ARC-Seal: i=1; a=rsa-sha256; t=1788286261; cv=none; d=zohomail.com; s=zohoarc; b=QzZgcOnwPNjeiUGPwMxpESLAwjSfbFwTUVNoCw5JoRr3PyITW44XUY428q8gHKr+bHeYBh4ImaJIkYGsV61mhXntvCir/h+UPNX3ENmUashhBSlG4dxUeAv417vb4vaViKj8TylpWb2nQVtiP5w3Q5jCsQ3bZzSxbvm0X10hi/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788286261; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=aOkhjiTA152ajScLyQAGXJjOlyLqpZinwlJKaTnX7k4=; b=Gn9Dbjun+peV2Qn9qvpGpSoeKXNGou2kKffi1vqwlO3X7GlppO4I5SD33XNRvwnjs217Zm4AfRaDAaM/nbs5Ux8z7CLXMZpFM6F+coVh/j41K391RA/wTq4K7P3gajSfkZdTkHoP4R9pk2acmPpqHDq/Ekc9h1tIDl1++KnhgdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=rong.moe; spf=pass smtp.mailfrom=i@rong.moe; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1788286261; s=zmail2048; d=rong.moe; i=i@rong.moe; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=aOkhjiTA152ajScLyQAGXJjOlyLqpZinwlJKaTnX7k4=; b=bkLsu7uvD4wHNJelz503CiT7wjeQWaHyirNVgNuFNTjA2T3Cll9m5l1affgt2Sng ejvNJSMLMzXjgRr8CRsjAnrnzK4K7kDmjumI+4UN0eRb2gC4GCz0CkAFQeTOLlZY0P0 Byawu0D68AoSYy+tThvH8SZJsk0LB+CZahaMJ4Q0WuowTzIunLDKCzXoFuV5RJFGqOh 1ghV0J2J6f/wP4iOti709JsEys4C9pHLbjZQU9ddMogwmewX6eueAP84lI8RKxGlX+b cSMRa3OBT14gqI6bgrTEcigByhJ8oW9/94FHIGdRf6iuV0yZL9h3rBdfxCQD58CjDOr aTWP/Gyggg== Received: by mx.zohomail.com with SMTPS id 1788286259538207.61326754591994; Tue, 1 Sep 2026 11:10:59 -0700 (PDT) From: Rong Zhang Date: Wed, 02 Sep 2026 02:09:21 +0800 Subject: [PATCH v6 02/12] leds: Move led_trigger_is_hw_controlled() to the right place Precedence: bulk X-Mailing-List: linux-leds@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260902-leds-trigger-hw-changed-v6-2-55693cd78877@rong.moe> References: <20260902-leds-trigger-hw-changed-v6-0-55693cd78877@rong.moe> In-Reply-To: <20260902-leds-trigger-hw-changed-v6-0-55693cd78877@rong.moe> To: Lee Jones , Pavel Machek , Jonathan Corbet , Shuah Khan , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Benson Leung , Guenter Roeck , =?utf-8?q?Marek_Beh=C3=BAn?= , Mark Pearson , "Derek J. Clark" , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Ike Panhc Cc: Andrew Lunn , Jakub Kicinski , Vishnu Sankar , Vishnu Sankar , linux-leds@vger.kernel.org, netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev, platform-driver-x86@vger.kernel.org, Rong Zhang X-Mailer: b4 0.17-dev-1f2f7 X-ZohoMailClient: External Currently led_trigger_is_hw_controlled() is placed at led-class.c, which is not an right place as it falls into the triggers namespace and does triggers stuff. Move it into led-triggers.c, and split it into locked and unlocked variant for convenience. Fixes: b819dc7d8fb2 ("leds: core: Report ENODATA for brightness of hardware controlled LED") Acked-by: Ike Panhc Signed-off-by: Rong Zhang --- Changes in v3: - New patch in the series, the dependency of the following patches --- drivers/leds/led-class.c | 10 ---------- drivers/leds/led-triggers.c | 19 +++++++++++++++++++ include/linux/leds.h | 8 ++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 4259533dafa1..7110bfbe3b83 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -27,16 +27,6 @@ static LIST_HEAD(leds_lookup_list); static struct workqueue_struct *leds_wq; -static bool led_trigger_is_hw_controlled(struct led_classdev *led_cdev) -{ -#ifdef CONFIG_LEDS_TRIGGERS - guard(rwsem_read)(&led_cdev->trigger_lock); - return led_cdev->trigger && led_cdev->trigger->trigger_type; -#else - return false; -#endif -} - static ssize_t brightness_show(struct device *dev, struct device_attribute *attr, char *buf) { diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index b1223218bda1..bf2543538ed0 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -7,9 +7,11 @@ * Author: Richard Purdie */ +#include #include #include #include +#include #include #include #include @@ -33,6 +35,23 @@ trigger_relevant(struct led_classdev *led_cdev, struct led_trigger *trig) return !trig->trigger_type || trig->trigger_type == led_cdev->trigger_type; } +static bool __led_trigger_is_hw_controlled(struct led_classdev *led_cdev) +{ + lockdep_assert_held(&led_cdev->trigger_lock); + + if (!led_cdev->trigger) + return false; + + return led_cdev->trigger->trigger_type; +} + +bool led_trigger_is_hw_controlled(struct led_classdev *led_cdev) +{ + guard(rwsem_read)(&led_cdev->trigger_lock); + return __led_trigger_is_hw_controlled(led_cdev); +} +EXPORT_SYMBOL_GPL(led_trigger_is_hw_controlled); + ssize_t led_trigger_write(struct file *filp, struct kobject *kobj, const struct bin_attribute *bin_attr, char *buf, loff_t pos, size_t count) diff --git a/include/linux/leds.h b/include/linux/leds.h index a515f075c29a..46ad2e03e1c6 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -534,6 +534,8 @@ void led_trigger_set_default(struct led_classdev *led_cdev); int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger); void led_trigger_remove(struct led_classdev *led_cdev); +bool led_trigger_is_hw_controlled(struct led_classdev *led_cdev); + static inline void led_set_trigger_data(struct led_classdev *led_cdev, void *trigger_data) { @@ -584,6 +586,12 @@ static inline int led_trigger_set(struct led_classdev *led_cdev, } static inline void led_trigger_remove(struct led_classdev *led_cdev) {} + +static inline bool led_trigger_is_hw_controlled(struct led_classdev *led_cdev) +{ + return false; +} + static inline void led_set_trigger_data(struct led_classdev *led_cdev) {} static inline void *led_get_trigger_data(struct led_classdev *led_cdev) { -- 2.55.0