From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 F1AAD22091 for ; Mon, 8 Apr 2024 15:50:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712591404; cv=none; b=myOp3tE254vP6n42z1anQYDxZkTlF+2kelRV1QGbTrkZY9B993hBGMslOAuSVaR1cEYFM7h1TRFlYOBIg/ZqrZz/+RwBVu3F8c5dsXZsA4UpcRb/CfWP2UchztMgn4UHyKFMlI3Zf2PJjwFc3KDiA0mkbZ7veBhXCrUrxTfh1ek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712591404; c=relaxed/simple; bh=ty/CVd4TTkw7zJcxiPWThfim4GmGkodvBh97gUHo4qk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Ze6EnV4lQxuwHH9ODFOohK6TDQOZhJL2TnZlXegcoJ9Wrftr5GUUUPw4SGIHoxGy9xj6OkTWnNpko1Xg7Wk1vYvlkzKZZAdgvYNa/YSah0N1aLepmqHostZnCtsxmThPb5hNMN6o1fF+WCnqBGuSvPU7kUD0zRQuXCZAFsFkR1Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VeccVPQa; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VeccVPQa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591400; 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=VCSzxzdVxSU29njl+SVIs1GGY32kHpcJTqbBqSeU5KI=; b=VeccVPQa8G5Rjp/rCe/s0TU97ivQYb4Gr8MdEXrpdlqN32l9nfGRmABfVYPAlqmci98qU3 FsE1twZRmazjsOYD+/Ey9iRUT4KnNsf3nwIVGJeNMTRW/Ig+cGbGtZaIeB6PuJ+64oHVTT cSkLXaa3GeM8iTgK+E0AglYclvezezc= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-167-qWH9feeHOKCLbv75EruYsQ-1; Mon, 08 Apr 2024 11:49:58 -0400 X-MC-Unique: qWH9feeHOKCLbv75EruYsQ-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5684c1abc7fso1893099a12.3 for ; Mon, 08 Apr 2024 08:49:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591397; x=1713196197; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VCSzxzdVxSU29njl+SVIs1GGY32kHpcJTqbBqSeU5KI=; b=P+mOqAFEtq/QQNqSa7TdHhsvqSTo5uuXWI0LGv8oppMwXtb6/qbxisi9wKIpcFM9id DhX8kLb4X5L8Qcw8by2And031MWnZXfupgxLYWiMWlCK2aurgBg06diUq/1hjnRFntvA DYGAee889LQ7jFo+mraOx6C5kfmKys+gJwgfBVgVtt0+l0gJzWOTZwSC2/6qw64kZ0nB FN55g/f4NSi5E7Fm40YYGSYoIi3n/ISayA6j9pjlyJ8th02PQzlb/Q9piI2j0gAZobd+ TGC1ecgBV/4Ep75qBygU9jsYyuoCP2+1qSvWMtVHzsHzfWlneZ1SAugjQVCv22vX4DzB tsYw== X-Forwarded-Encrypted: i=1; AJvYcCU8vqxa4e+8NhyVf8IPW7zJJDqPX9fsb/1lpz+7MJJpIHoZlHoQy7+xiuIRJ1KHheSM5uS3EQaog4NSLBnQ0Va0HIydnamrYMQhnA== X-Gm-Message-State: AOJu0YxmntWhtH//TnzVsfAiAk1c2aP0/EILnl0YhpGIUvK6Hi6HJtiB DnO1m1IBtxFkvHQPqh+Z6uZfW9Fv6X4tE+Ko71vtI6qaMdPHK1roZTEtS8PMmV7tzkIHEzmjTtU jcRCjzEIcWTtibl8hHEtCjcmqohoIeevmenWgDTCJY8ON6c+eZjMel9buKdE= X-Received: by 2002:a50:c30c:0:b0:56d:c295:dde3 with SMTP id a12-20020a50c30c000000b0056dc295dde3mr7866827edb.35.1712591397427; Mon, 08 Apr 2024 08:49:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpteSqH7bmbEhgkTidBlhAPpdsINF1J8RY2W+YoNQKBvbxOaGD3t8TIPxLJhKwHDyPy4PMqg== X-Received: by 2002:a50:c30c:0:b0:56d:c295:dde3 with SMTP id a12-20020a50c30c000000b0056dc295dde3mr7866811edb.35.1712591397056; Mon, 08 Apr 2024 08:49:57 -0700 (PDT) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id ig4-20020a056402458400b0056e51535a2esm2362376edb.82.2024.04.08.08.49.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Apr 2024 08:49:56 -0700 (PDT) Message-ID: Date: Mon, 8 Apr 2024 17:49:56 +0200 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] platform/x86: ideapad-laptop: add fn_lock_get/set functions To: Gergo Koteles , Ike Panhc , =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= , Pavel Machek , Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org References: Content-Language: en-US, nl From: Hans de Goede In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 4/2/24 3:21 PM, Gergo Koteles wrote: > The FnLock is retrieved and set in several places in the code. > > Move details into ideapad_fn_lock_get and ideapad_fn_lock_set functions. > > Signed-off-by: Gergo Koteles Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/platform/x86/ideapad-laptop.c | 38 +++++++++++++++++++-------- > 1 file changed, 27 insertions(+), 11 deletions(-) > > diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c > index 901849810ce2..529df08af548 100644 > --- a/drivers/platform/x86/ideapad-laptop.c > +++ b/drivers/platform/x86/ideapad-laptop.c > @@ -513,11 +513,8 @@ static ssize_t fan_mode_store(struct device *dev, > > static DEVICE_ATTR_RW(fan_mode); > > -static ssize_t fn_lock_show(struct device *dev, > - struct device_attribute *attr, > - char *buf) > +static int ideapad_fn_lock_get(struct ideapad_private *priv) > { > - struct ideapad_private *priv = dev_get_drvdata(dev); > unsigned long hals; > int err; > > @@ -525,7 +522,27 @@ static ssize_t fn_lock_show(struct device *dev, > if (err) > return err; > > - return sysfs_emit(buf, "%d\n", !!test_bit(HALS_FNLOCK_STATE_BIT, &hals)); > + return !!test_bit(HALS_FNLOCK_STATE_BIT, &hals); > +} > + > +static int ideapad_fn_lock_set(struct ideapad_private *priv, bool state) > +{ > + return exec_sals(priv->adev->handle, > + state ? SALS_FNLOCK_ON : SALS_FNLOCK_OFF); > +} > + > +static ssize_t fn_lock_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct ideapad_private *priv = dev_get_drvdata(dev); > + int brightness; > + > + brightness = ideapad_fn_lock_get(priv); > + if (brightness < 0) > + return brightness; > + > + return sysfs_emit(buf, "%d\n", brightness); > } > > static ssize_t fn_lock_store(struct device *dev, > @@ -540,7 +557,7 @@ static ssize_t fn_lock_store(struct device *dev, > if (err) > return err; > > - err = exec_sals(priv->adev->handle, state ? SALS_FNLOCK_ON : SALS_FNLOCK_OFF); > + err = ideapad_fn_lock_set(priv, state); > if (err) > return err; > > @@ -1709,7 +1726,6 @@ static void ideapad_wmi_notify(struct wmi_device *wdev, union acpi_object *data) > { > struct ideapad_wmi_private *wpriv = dev_get_drvdata(&wdev->dev); > struct ideapad_private *priv; > - unsigned long result; > > mutex_lock(&ideapad_shared_mutex); > > @@ -1722,11 +1738,11 @@ static void ideapad_wmi_notify(struct wmi_device *wdev, union acpi_object *data) > ideapad_input_report(priv, 128); > break; > case IDEAPAD_WMI_EVENT_FN_KEYS: > - if (priv->features.set_fn_lock_led && > - !eval_hals(priv->adev->handle, &result)) { > - bool state = test_bit(HALS_FNLOCK_STATE_BIT, &result); > + if (priv->features.set_fn_lock_led) { > + int brightness = ideapad_fn_lock_get(priv); > > - exec_sals(priv->adev->handle, state ? SALS_FNLOCK_ON : SALS_FNLOCK_OFF); > + if (brightness >= 0) > + ideapad_fn_lock_set(priv, brightness); > } > > if (data->type != ACPI_TYPE_INTEGER) {