From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: linuxarm@huawei.com, mauro.chehab@huawei.com,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Pavel Machek <pavel@ucw.cz>,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
linux-leds@vger.kernel.org
Subject: [PATCH v2 15/17] leds: leds-nuc: fix software blink behavior logic
Date: Tue, 18 May 2021 17:09:04 +0200 [thread overview]
Message-ID: <44aed20dc44c893c12ad26b109a8a0e49bc4dab0.1621349814.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1621349813.git.mchehab+huawei@kernel.org>
The is_visible logic for it is plain wrong:
1. it is used only during devnode creation;
2. it was using the wrong field (id, instead of indicator).
Fix it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/leds/leds-nuc.c | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/drivers/leds/leds-nuc.c b/drivers/leds/leds-nuc.c
index 719a57841c03..4d4ea6fbeff4 100644
--- a/drivers/leds/leds-nuc.c
+++ b/drivers/leds/leds-nuc.c
@@ -1479,6 +1479,9 @@ static ssize_t show_blink_behavior(struct device *dev,
if (led->api_rev == LED_API_NUC6)
return nuc6_show_blink_behavior(dev, attr, buf);
+ if (led->indicator != LED_IND_SOFTWARE)
+ return -EINVAL;
+
return offset_show_blink_behavior(dev, attr, 0, buf);
}
@@ -1492,6 +1495,9 @@ static ssize_t store_blink_behavior(struct device *dev,
if (led->api_rev == LED_API_NUC6)
return nuc6_store_blink_behavior(dev, attr, buf, len);
+ if (led->indicator != LED_IND_SOFTWARE)
+ return -EINVAL;
+
return offset_store_blink_behavior(dev, attr, 0, buf, len);
}
@@ -1596,6 +1602,9 @@ static ssize_t show_blink_frequency(struct device *dev,
if (led->api_rev == LED_API_NUC6)
return nuc6_show_blink_frequency(dev, attr, buf);
+ if (led->indicator != LED_IND_SOFTWARE)
+ return -EINVAL;
+
return offset_show_blink_frequency(dev, attr, 0, buf);
}
@@ -1609,26 +1618,12 @@ static ssize_t store_blink_frequency(struct device *dev,
if (led->api_rev == LED_API_NUC6)
return nuc6_store_blink_frequency(dev, attr, buf, len);
+ if (led->indicator != LED_IND_SOFTWARE)
+ return -EINVAL;
+
return offset_store_blink_frequency(dev, attr, 0, buf, len);
}
-static umode_t nuc_wmi_led_blink_is_visible(struct kobject *kobj,
- struct attribute *attr, int idx)
-{
- struct device *dev = kobj_to_dev(kobj);
- struct led_classdev *cdev = dev_get_drvdata(dev);
- struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev);
- umode_t mode = attr->mode;
-
- if (led->api_rev == LED_API_NUC6)
- return mode;
-
- if (led->id == LED_IND_SOFTWARE)
- return mode;
-
- return 0;
-}
-
/* HDD activity behavior */
static ssize_t show_hdd_default(struct device *dev,
struct device_attribute *attr,
@@ -1788,7 +1783,6 @@ static struct attribute *nuc_wmi_led_blink_behavior_attr[] = {
};
static const struct attribute_group nuc_wmi_led_blink_attribute_group = {
- .is_visible = nuc_wmi_led_blink_is_visible,
.attrs = nuc_wmi_led_blink_behavior_attr,
};
--
2.31.1
next prev parent reply other threads:[~2021-05-18 15:11 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 15:08 [PATCH v2 00/17] Adding support for controlling the leds found on Intel NUC Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 01/17] docs: describe the API used to set NUC LEDs Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 02/17] leds: add support for NUC WMI LEDs Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 03/17] leds: leds-nuc: detect WMI API detection Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 04/17] leds: leds-nuc: add support for changing S0 brightness Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 05/17] leds: leds-nuc: add all types of brightness Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 06/17] leds: leds-nuc: allow changing the LED colors Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 07/17] leds: leds-nuc: add support for WMI API version 1.0 Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 08/17] leds: leds-nuc: add basic support for NUC6 WMI Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 09/17] leds: leds-nuc: add brightness and color for NUC6 API Mauro Carvalho Chehab
2021-05-18 15:08 ` [PATCH v2 10/17] leds: leds-nuc: Add support to blink behavior for NUC8/10 Mauro Carvalho Chehab
2021-05-19 7:58 ` Marek Behun
2021-05-19 10:09 ` Mauro Carvalho Chehab
2021-05-18 15:09 ` [PATCH v2 11/17] leds: leds-nuc: get rid of an unused variable Mauro Carvalho Chehab
2021-05-18 15:09 ` [PATCH v2 12/17] leds: leds-nuc: implement blink control for NUC6 Mauro Carvalho Chehab
2021-05-18 15:09 ` [PATCH v2 13/17] leds: leds-nuc: better detect NUC6/NUC7 devices Mauro Carvalho Chehab
2021-05-18 15:09 ` [PATCH v2 14/17] leds: leds-nuc: add support for HDD activity default Mauro Carvalho Chehab
2021-05-18 15:09 ` Mauro Carvalho Chehab [this message]
2021-05-18 15:09 ` [PATCH v2 16/17] leds: leds-nuc: add support for changing the ethernet type indicator Mauro Carvalho Chehab
2021-05-19 8:02 ` Marek Behún
2021-05-19 10:18 ` Mauro Carvalho Chehab
2021-05-19 12:11 ` Marek Behún
2021-05-19 14:24 ` Mauro Carvalho Chehab
2021-05-19 15:55 ` Marek Behún
2021-05-19 18:30 ` Mauro Carvalho Chehab
2021-05-20 11:00 ` Marek Behún
2021-05-20 16:00 ` Mauro Carvalho Chehab
2021-05-20 16:36 ` Marek Behún
2021-05-20 18:59 ` Mauro Carvalho Chehab
2021-05-20 20:07 ` Marek Behún
2021-05-21 9:14 ` Mauro Carvalho Chehab
2021-05-26 14:51 ` Pavel Machek
2021-05-28 11:33 ` Mauro Carvalho Chehab
2021-05-26 14:47 ` Pavel Machek
2021-05-28 11:24 ` Mauro Carvalho Chehab
2021-05-18 15:09 ` [PATCH v2 17/17] leds: leds-nuc: add support for changing the power limit scheme Mauro Carvalho Chehab
2021-05-19 11:11 ` [PATCH v2 00/17] Adding support for controlling the leds found on Intel NUC Pavel Machek
2021-05-19 12:15 ` Mauro Carvalho Chehab
2021-05-19 19:41 ` Pavel Machek
2021-05-19 23:07 ` Mauro Carvalho Chehab
2021-05-20 16:19 ` Marek Behún
2021-05-20 19:16 ` Mauro Carvalho Chehab
2021-05-20 19:43 ` Marek Behún
2021-05-21 9:57 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44aed20dc44c893c12ad26b109a8a0e49bc4dab0.1621349814.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mauro.chehab@huawei.com \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).