From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linus Walleij <linus.walleij@linaro.org>,
linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org
Subject: [PATCH v4 09/14] software node: simplify property_entry_read_string_array()
Date: Tue, 10 Sep 2019 22:12:26 -0700 [thread overview]
Message-ID: <20190911051231.148032-10-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20190911051231.148032-1-dmitry.torokhov@gmail.com>
There is no need to treat string arrays and single strings separately, we can go
exclusively by the element length in relation to data type size.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/base/swnode.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index a019b5e90d3b..9c3e566c753e 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -173,28 +173,21 @@ static int property_entry_read_string_array(const struct property_entry *props,
const char *propname,
const char **strings, size_t nval)
{
- const struct property_entry *prop;
const void *pointer;
- size_t array_len, length;
+ size_t length;
+ int array_len;
/* Find out the array length. */
- prop = property_entry_get(props, propname);
- if (!prop)
- return -EINVAL;
-
- if (prop->is_array)
- /* Find the length of an array. */
- array_len = property_entry_count_elems_of_size(props, propname,
- sizeof(const char *));
- else
- /* The array length for a non-array string property is 1. */
- array_len = 1;
+ array_len = property_entry_count_elems_of_size(props, propname,
+ sizeof(const char *));
+ if (array_len < 0)
+ return array_len;
/* Return how many there are if strings is NULL. */
if (!strings)
return array_len;
- array_len = min(nval, array_len);
+ array_len = min_t(size_t, nval, array_len);
length = array_len * sizeof(*strings);
pointer = property_entry_find(props, propname, length);
--
2.23.0.162.g0b9fbb3734-goog
next prev parent reply other threads:[~2019-09-11 5:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 5:12 [PATCH v4 00/14] software node: add support for reference properties Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 01/14] software node: remove DEV_PROP_MAX Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 02/14] software node: introduce PROPERTY_ENTRY_ARRAY_XXX_LEN() Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 03/14] efi/apple-properties: use PROPERTY_ENTRY_U8_ARRAY_LEN Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 04/14] software node: mark internal macros with double underscores Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 05/14] software node: clean up property_copy_string_array() Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 06/14] software node: get rid of property_set_pointer() Dmitry Torokhov
2019-09-11 8:29 ` Andy Shevchenko
2019-09-11 8:37 ` Dmitry Torokhov
2019-09-11 9:21 ` Andy Shevchenko
2019-09-11 5:12 ` [PATCH v4 07/14] software node: remove property_entry_read_uNN_array functions Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 08/14] software node: unify PROPERTY_ENTRY_XXX macros Dmitry Torokhov
2019-09-11 5:12 ` Dmitry Torokhov [this message]
2019-09-11 5:12 ` [PATCH v4 10/14] software node: rename is_array to is_inline Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 11/14] software node: move small properties inline when copying Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 12/14] software node: implement reference properties Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 13/14] platform/x86: intel_cht_int33fe: use inline " Dmitry Torokhov
2019-09-11 5:12 ` [PATCH v4 14/14] software node: remove separate handling of references Dmitry Torokhov
2019-10-03 0:32 ` [PATCH v4 00/14] software node: add support for reference properties Dmitry Torokhov
2019-10-03 8:39 ` Rafael J. Wysocki
2019-10-11 23:25 ` Dmitry Torokhov
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=20190911051231.148032-10-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
/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).