From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-acpi@vger.kernel.org, devicetree@vger.kernel.org
Cc: sudeep.holla@arm.com, lorenzo.pieralisi@arm.com,
mika.westerberg@linux.intel.com, rafael@kernel.org,
mark.rutland@arm.com, broonie@kernel.org, robh@kernel.org,
ahs3@redhat.com
Subject: [PATCH 10/20] device property: Read strings using string array reading functions
Date: Thu, 23 Feb 2017 19:01:06 +0200 [thread overview]
Message-ID: <1487869276-25244-11-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1487869276-25244-1-git-send-email-sakari.ailus@linux.intel.com>
Always read strings using of_property_read_string_array() instead of
of_property_read_string(). This allows using a single operation struct
callback for accessing strings.
Same for pset_prop_read_string_array() and pset_prop_read_string().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/base/property.c | 47 +----------------------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 8c2068a..b251525 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -158,31 +158,6 @@ static int pset_prop_read_string_array(struct property_set *pset,
return 0;
}
-static int pset_prop_read_string(struct property_set *pset,
- const char *propname, const char **strings)
-{
- struct property_entry *prop;
- const char **pointer;
-
- prop = pset_prop_get(pset, propname);
- if (!prop)
- return -EINVAL;
- if (!prop->is_string)
- return -EILSEQ;
- if (prop->is_array) {
- pointer = prop->pointer.str;
- if (!pointer)
- return -ENODATA;
- } else {
- pointer = &prop->value.str;
- if (*pointer && strnlen(*pointer, prop->length) >= prop->length)
- return -EILSEQ;
- }
-
- *strings = *pointer;
- return 0;
-}
-
static bool pset_fwnode_property_present(struct fwnode_handle *fwnode,
const char *propname)
{
@@ -586,19 +561,6 @@ static int __fwnode_property_read_string_array(struct fwnode_handle *fwnode,
return -ENXIO;
}
-static int __fwnode_property_read_string(struct fwnode_handle *fwnode,
- const char *propname, const char **val)
-{
- if (is_of_node(fwnode))
- return of_property_read_string(to_of_node(fwnode), propname, val);
- else if (is_acpi_node(fwnode))
- return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
- val, 1);
- else if (is_pset_node(fwnode))
- return pset_prop_read_string(to_pset_node(fwnode), propname, val);
- return -ENXIO;
-}
-
/**
* fwnode_property_read_string_array - return string array property of a node
* @fwnode: Firmware node to get the property of
@@ -650,14 +612,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);
int fwnode_property_read_string(struct fwnode_handle *fwnode,
const char *propname, const char **val)
{
- int ret;
-
- ret = __fwnode_property_read_string(fwnode, propname, val);
- if (ret == -EINVAL && !IS_ERR_OR_NULL(fwnode) &&
- !IS_ERR_OR_NULL(fwnode->secondary))
- ret = __fwnode_property_read_string(fwnode->secondary,
- propname, val);
- return ret;
+ return fwnode_property_read_string_array(fwnode, propname, val, 1);
}
EXPORT_SYMBOL_GPL(fwnode_property_read_string);
--
2.7.4
next prev parent reply other threads:[~2017-02-23 17:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 17:00 [PATCH 00/20] Move firmware specific code to firmware specific locations Sakari Ailus
2017-02-23 17:00 ` [PATCH 01/20] device property: fwnode_property_read_string_array() may return -EILSEQ Sakari Ailus
2017-02-23 17:00 ` [PATCH 02/20] device property: Fix reading pset strings using array access functions Sakari Ailus
2017-02-23 17:00 ` [PATCH 03/20] device property: of_property_read_string_array() returns number of strings Sakari Ailus
2017-02-23 23:42 ` Rob Herring
2017-02-24 8:15 ` Sakari Ailus
2017-02-23 17:01 ` [PATCH 04/20] device property: Add operations struct for fwnode operations Sakari Ailus
2017-02-23 17:01 ` [PATCH 05/20] device property: Add macros for calling " Sakari Ailus
2017-02-24 9:36 ` [PATCH v1.1 " Sakari Ailus
2017-02-23 17:01 ` [PATCH 06/20] device property: Introduce firmware property operations, set them Sakari Ailus
2017-02-23 17:01 ` [PATCH 07/20] device property: Use fwnode_operations for fwnode_handle_{get,put} Sakari Ailus
2017-02-23 17:01 ` [PATCH 08/20] device property: Use fwnode_operations for fwnode_property_present() Sakari Ailus
2017-02-23 17:01 ` [PATCH 09/20] device property: Use fwnode_operations for reading integer arrays Sakari Ailus
2017-02-23 17:01 ` Sakari Ailus [this message]
[not found] ` <1487869276-25244-1-git-send-email-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-23 17:01 ` [PATCH 11/20] device property: Use fwnode_operations for reading string arrays Sakari Ailus
2017-02-23 17:01 ` [PATCH 12/20] device property: Use fwnode_operations for obtaining parent node Sakari Ailus
2017-02-23 17:01 ` [PATCH 15/20] device property: Use fwnode_operations for obtaining next graph endpoint Sakari Ailus
2017-02-23 17:01 ` [PATCH 17/20] device property: Use fwnode_operations for obtaining the remote port Sakari Ailus
2017-02-23 17:01 ` [PATCH 13/20] device property: Use fwnode_operations for obtaining next child node Sakari Ailus
2017-02-23 17:01 ` [PATCH 14/20] device property: Use fwnode_operations for obtaining a named " Sakari Ailus
2017-02-23 17:01 ` [PATCH 16/20] device property: Use fwnode_operations for obtaining the remote endpoint Sakari Ailus
2017-02-23 17:01 ` [PATCH 18/20] device property: Use fwnode_operations for obtaining the remote port parent Sakari Ailus
2017-02-23 17:01 ` [PATCH 19/20] device property: Use fwnode_operations for parsing graph endpoint Sakari Ailus
2017-02-23 17:01 ` [PATCH 20/20] device property: Implement fwnode_get_next_parent() using fwnode interface Sakari Ailus
2017-02-23 22:37 ` [PATCH 00/20] Move firmware specific code to firmware specific locations Rafael J. Wysocki
[not found] ` <2915459.fDeP2CYj8T-yvgW3jdyMHm1GS7QM15AGw@public.gmane.org>
2017-02-24 8:25 ` Sakari Ailus
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=1487869276-25244-11-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=ahs3@redhat.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=sudeep.holla@arm.com \
/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).