From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795017105; b=V/lALhRJhUMBOlN6b2DWM/XLfCvz1/DlhlZ7HzT7e5QfS/PgDLm30v//bAIsA1Ij+0Qm ukBFWG5hKaHOLeQDQCV/pGjoqMuGvLNQfliu4rVB+ulkLFa4eWHQohC/uNagU1GFJzkq9 FuMYnemnm89VzwNb4HV2s+i7/WrpY+wkukCcKXn921AzOLvpa/RuGe2GSxSXdF83KXQog B4Vd+oqimADIIw0FxTRHiYSP1PmIVAKFEtpC1wMsG3BPD14YptnPzU+8rOPwvSOVysOd4 4bVv8Wl8z+xDSjPubDxSX7bcZw+r11YEyjahlmbeKa4ehWrY8jigKlql+u/EF04u6ng== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795017105; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Wy3Tism909LM6JPeo3fQJwwWv6j38XRwXNrhOuGolVo=; b=sr6OxSV2aXofVfh1aNkhGk+PJEUkThylEZI6q9GyNrJNMtfTtKc3T6t5yrOvDzwn/nxP 5GDYSKMC4gVeBi2b3fN1mKFUYDzJ1kULNYZ5GAg1dy2kcHWQ3iRzVt2+tk3dnlTLiz08a wOwWvHJgz4yl474/wM9u2pYh9BENa6M0+ijE1Xv11dUutGHUoDn+VLE6+jmK6cqvp39Uc aDL1roCiBgwrn+1U42HffTuHcyPfsTOxD95iTuFY3WCTCt3Jf75M0Ty84pWBwkNx18j84 zo3UnKMREvGUwZf78p1YYLpM9cHUDbGl2MM6lgjGJzAUndwbfdn/F5dUNIJucmTlh8Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=qfd68Q8L; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAD43606A325; Wed, 18 Nov 2026 15:51:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=qfd68Q8L Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEC381F000C4; Wed, 18 Nov 2026 15:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795017105; bh=Wy3Tism909LM6JPeo3fQJwwWv6j38XRwXNrhOuGolVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qfd68Q8L5LyXDMWATtNt0tkO2bVVoPQoi9/HDVaWsicVJu/e+WkmS8QxKLbG9CDKv /ZeE/bCgKpW0eMTNyqfF2Fe5sF5332Z0MnddxGRDePUKDBok4KePUHDssT5qX866n6 hYmhoFmfh+iCzeXA2vStAXDEk9mGxuDKEJ8VmIcs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ike Panhc , Rong Zhang , Lee Jones , Sasha Levin Subject: [PATCH 7.3 0765/2651] leds: trigger: Move led_trigger_is_hw_controlled() to the right place Date: Wed, 18 Nov 2026 15:33:25 +0100 Message-ID: <20261118150315.422875727@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rong Zhang [ Upstream commit 7879d6277485697cf37eb3c1b89ce260d8c67e4f ] 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 Link: https://patch.msgid.link/20260921-leds-trigger-hw-changed-v7-2-fe3cdb6dec51@rong.moe Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- 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 4259533dafa19..7110bfbe3b837 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 b1223218bda11..bf2543538ed08 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 a515f075c29a1..46ad2e03e1c65 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.53.0