From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Calvin Johnson <calvin.johnson@oss.nxp.com>
Subject: [PATCH v1 7/7] ACPI: property: Allow counting a single value as an array of 1 element
Date: Wed, 10 Feb 2021 13:43:20 +0200 [thread overview]
Message-ID: <20210210114320.3478-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210210114320.3478-1-andriy.shevchenko@linux.intel.com>
We allow to read the single value as a first element in the array.
Unfortunately the counting doesn't work in this case and we can't
call fwnode_property_count_*() API without getting an error.
Modify acpi_data_prop_read() to always try the single value read
and thus allow counting the single value as an array of 1 element.
Reported-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/property.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 236316ee0e25..d6100585fceb 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -913,12 +913,14 @@ static int acpi_data_prop_read(const struct acpi_device_data *data,
const union acpi_object *items;
int ret;
- if (val && nval == 1) {
+ /* Try to read as a single value first */
+ if (!val || nval == 1) {
ret = acpi_data_prop_read_single(data, propname, proptype, val);
if (ret >= 0)
- return ret;
+ return val ? ret : 1;
}
+ /* It's not the single value, get an array instead */
ret = acpi_data_get_property_array(data, propname, ACPI_TYPE_ANY, &obj);
if (ret)
return ret;
--
2.30.0
next prev parent reply other threads:[~2021-02-10 11:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 11:43 [PATCH v1 1/7] ACPI: property: Remove dead code Andy Shevchenko
2021-02-10 11:43 ` [PATCH v1 2/7] ACPI: property: Make acpi_node_prop_read() static Andy Shevchenko
2021-02-10 11:43 ` [PATCH v1 3/7] ACPI: property: Satisfy kernel doc validator (part 1) Andy Shevchenko
2021-02-10 11:43 ` [PATCH v1 4/7] ACPI: property: Satisfy kernel doc validator (part 2) Andy Shevchenko
2021-02-10 11:43 ` [PATCH v1 5/7] ACPI: property: Refactor acpi_data_prop_read_single() Andy Shevchenko
2021-02-10 11:43 ` [PATCH v1 6/7] ACPI: property: Allow to validate a single value Andy Shevchenko
2021-02-10 11:43 ` Andy Shevchenko [this message]
2021-02-10 12:36 ` [PATCH v1 7/7] ACPI: property: Allow counting a single value as an array of 1 element Rafael J. Wysocki
2021-02-10 13:31 ` Rafael J. Wysocki
2021-02-10 13:48 ` Rafael J. Wysocki
2021-02-10 14:48 ` Andy Shevchenko
2021-02-10 15:01 ` Rafael J. Wysocki
2021-02-10 15:41 ` Andy Shevchenko
2021-02-10 15:44 ` Rafael J. Wysocki
2021-02-11 15:42 ` Andy Shevchenko
2021-02-11 16:39 ` Rafael J. Wysocki
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=20210210114320.3478-7-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=calvin.johnson@oss.nxp.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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).