From patchwork Tue Feb 13 07:31:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 772777 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F4AC20B27; Tue, 13 Feb 2024 07:31:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707809501; cv=none; b=blwlSUnP2//DP2XIF7A7BqB5Zzc1d1BcgItx7wRn/+A372LgWzr5l+zFlMH+FcC0t4iPrTU14Aed6V8J/eVpl9ZUHCmIPvb/bNp0wxelseB9cApHvoZN+iaroIRyyU6ZCLMMU2rtIiwAFonbz493OLInDmEGIrslsG8RNZiNPeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707809501; c=relaxed/simple; bh=IEP5Pp/MGyp4bSvWtxsqiSvIpWE8fFGf72aSgQ1kxZQ=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=NF3UOOrnv+YT7ynK5e74BKr45N77RRRRkMukl4Lt/QqGYAqwXqds02/xoptLNGPmSAqi/mGWEqTghN1fbeMnhlEfU7R0k4yD6zmMaozH878epSV+gA6wp3U8cOTBx7d0wS2yMpjxQUpG0A9PuAODg5QzDCCMhpXQhgbSaz4Da2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=O2gvB3Cz; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O2gvB3Cz" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a3cc8f0c97fso160231966b.0; Mon, 12 Feb 2024 23:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707809497; x=1708414297; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=g601Zqjiouh4eSRY41DYHDQ8iYJQProKGT5aNIaSf7E=; b=O2gvB3CztE3resBL+g0YLokAVv56ZuqLTVZjUHRAghlFo3e3ZdG9YKmHgJEvK0s+ZZ b6dCfygS/Qjjoi7vKdzl5FBTcUa31pTNYxb3no0HqdMQe88RQ3O8uL/Dr0p6Z6NldxRW 5B+6u3AxwJb5rsJo0i4EqndEdO8qotShOWsO/g5r2fADHhm/Kvr5yWpjrRPXgqUxLc7f TXGu/wLk0IPdo++1AvYuUzoFgqDzA9SPbV//drHSdScKvR12UqeHhkDYQG1OmFvbWTfm W18jH+1pmYrvAZlO2zFEsyFUxo43FL4scp4JjFLGrbnBTonTI8lG8xsESkNmWj1zHFcn 2t4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707809497; x=1708414297; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=g601Zqjiouh4eSRY41DYHDQ8iYJQProKGT5aNIaSf7E=; b=O2EXYj4GvzOWH+4EIwcr5G3+Dy3wkDlJCS02dLcOVL2a8URHOBvvecksemxgg+ZDQn OwTqm7XQa/yUeMUHcLlplURxazGjtEoCXu+qQr5/0BJRjgyBk9JUV+6a5xegoRQCSfeS Z2GvXTKopcs7rqPwdC/OtfkVZ+6p356IeDL6ffLsowSKB3KhQcNXjn0P7N1Y4iKgyKTR R2Iq7F1atDBmYB64lZGwz8Rl2HJqY9qF9jSyRmRZa9nzUJ8Ic1oq/xR6pFZlHpmt2RyD QNWkw1kI5dWuRiBYoaUkRc+vPJCL2DMSyMHxzzqgFUoMot9pUJQny15+MM/TNzWMdbsL jhSw== X-Forwarded-Encrypted: i=1; AJvYcCWvduAZ2NbpByD58bjSrhiuFACPzuVTv8/MD8aBICWlf68e3aw9qshxXQRwFmnygOXX93yrpM9kUGnjuwQA55JO05+lLRDi/ugyfznZR5fJdqYtwKgGmO4dhPv9WOHsbcOQ+L/ODnJn7nW4cw53LI3stG0H2Opyo21HZSRoi9Xrld5JxgY= X-Gm-Message-State: AOJu0YxEPK5+OGh25iJkKrUVNBms4ZyFGq+qrLK56U+xPfz5TTmfcFd0 e2sokdfnQZXXEFoU09WLYMBTLcCiRmXLknlzp2JjU/iDyBIpCPfM X-Google-Smtp-Source: AGHT+IF14vaqlG+OMUECtGu7dVBCPCGJGCGmNm2FBhOnQDSUpoqKW013cesdu609Zp9DxWikvZncWg== X-Received: by 2002:a17:906:3597:b0:a3c:f544:2ca9 with SMTP id o23-20020a170906359700b00a3cf5442ca9mr927715ejb.4.1707809496759; Mon, 12 Feb 2024 23:31:36 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCV2aIstHq/V+jsPSTtE3dNM+hD0JEODLZ84A0bpv0yAohlvXiS6cACLRTSeq0QwO+JmS8d4UP10Y66xZwG3eZQQq0gUcKvKTWOoMV98QET4rUGLzBXWf5XcRoQASn4Nnamn1uIp7I/Qy4gv+i+32qPEUJrs69fUIEOOswEF2n+Mw3iMt3vGg/v4xFb7rKuKit9jTjHRpWvUjnIV0aUgIC3WlB4d6lfTcbd99R2qsw99NmDS+AfXvito6Wc2dNjD/B4Pd/hqo583tZPlLrhQFxu4AWPOYkflrNYk4iR1qvYoc4WwrDQ9imz51Ig= Received: from ?IPV6:2a01:c23:bdaf:b200:457b:b235:98c6:f76b? (dynamic-2a01-0c23-bdaf-b200-457b-b235-98c6-f76b.c23.pool.telefonica.de. [2a01:c23:bdaf:b200:457b:b235:98c6:f76b]) by smtp.googlemail.com with ESMTPSA id vh2-20020a170907d38200b00a3d08f3283fsm251555ejc.104.2024.02.12.23.31.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Feb 2024 23:31:36 -0800 (PST) Message-ID: <5dff96ac-8ccd-401d-a6a9-19800b7143f0@gmail.com> Date: Tue, 13 Feb 2024 08:31:38 +0100 Precedence: bulk X-Mailing-List: linux-leds@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/4] leds: trigger: Store brightness set by led_trigger_event() Content-Language: en-US From: Heiner Kallweit To: Pavel Machek , Lee Jones , Jaroslav Kysela , Takashi Iwai , Dmitry Torokhov , Thomas Bogendoerfer Cc: "linux-leds@vger.kernel.org" , linux-sound@vger.kernel.org, "open list:HID CORE LAYER" , linux-mips@vger.kernel.org References: <30d49088-283c-40f3-b97b-fd5f5174a467@gmail.com> Autocrypt: addr=hkallweit1@gmail.com; keydata= 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 In-Reply-To: <30d49088-283c-40f3-b97b-fd5f5174a467@gmail.com> If a simple trigger is assigned to a LED, then the LED may be off until the next led_trigger_event() call. This may be an issue for simple triggers with rare led_trigger_event() calls, e.g. power supply charging indicators (drivers/power/supply/power_supply_leds.c). Therefore persist the brightness value of the last led_trigger_event() call and use this value if the trigger is assigned to a LED. In addition add a getter for the trigger brightness value. Signed-off-by: Heiner Kallweit --- drivers/leds/led-triggers.c | 6 ++++-- include/linux/leds.h | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 0f5ac3005..b1b323b19 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -194,11 +194,11 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) spin_unlock(&trig->leddev_list_lock); led_cdev->trigger = trig; + ret = 0; if (trig->activate) ret = trig->activate(led_cdev); else - ret = 0; - + led_set_brightness(led_cdev, trig->brightness); if (ret) goto err_activate; @@ -387,6 +387,8 @@ void led_trigger_event(struct led_trigger *trig, if (!trig) return; + trig->brightness = brightness; + rcu_read_lock(); list_for_each_entry_rcu(led_cdev, &trig->led_cdevs, trig_list) led_set_brightness(led_cdev, brightness); diff --git a/include/linux/leds.h b/include/linux/leds.h index 7598d4729..48fff5980 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -455,6 +455,9 @@ struct led_trigger { int (*activate)(struct led_classdev *led_cdev); void (*deactivate)(struct led_classdev *led_cdev); + /* Brightness set by led_trigger_event */ + enum led_brightness brightness; + /* LED-private triggers have this set */ struct led_hw_trigger_type *trigger_type; @@ -508,6 +511,12 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev) return led_cdev->trigger_data; } +static inline enum led_brightness +led_trigger_get_brightness(const struct led_trigger *trigger) +{ + return trigger ? trigger->brightness : LED_OFF; +} + #define module_led_trigger(__led_trigger) \ module_driver(__led_trigger, led_trigger_register, \ led_trigger_unregister) @@ -544,6 +553,12 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev) return NULL; } +static inline enum led_brightness +led_trigger_get_brightness(const struct led_trigger *trigger) +{ + return LED_OFF; +} + #endif /* CONFIG_LEDS_TRIGGERS */ /* Trigger specific enum */