From: "Clément Léger" <clement.leger@bootlin.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Daniel Scally <djrscally@gmail.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Wolfram Sang <wsa@kernel.org>, Peter Rosin <peda@axentia.se>,
Russell King <linux@armlinux.org.uk>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-i2c@vger.kernel.org, netdev@vger.kernel.org,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Clément Léger" <clement.leger@bootlin.com>
Subject: [RFC 04/10] property: add a callback parameter to fwnode_property_match_string()
Date: Mon, 21 Feb 2022 17:26:46 +0100 [thread overview]
Message-ID: <20220221162652.103834-5-clement.leger@bootlin.com> (raw)
In-Reply-To: <20220221162652.103834-1-clement.leger@bootlin.com>
This function will be modified to be reused for
fwnode_property_read_string_index(). In order to avoid copy/paste of
existing code, split the existing function and pass a callback that
will be executed once the string array has been retrieved.
In order to reuse this function with other actions.
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
drivers/base/property.c | 50 +++++++++++++++++++++++++++++++++++------
1 file changed, 43 insertions(+), 7 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 6ffb3ac4509c..cd1c30999fd9 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -410,10 +410,11 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string);
* fwnode_property_match_string - find a string in an array and return index
* @fwnode: Firmware node to get the property of
* @propname: Name of the property holding the array
- * @string: String to look for
+ * @cb: callback to execute on the string array
+ * @data: data to be passed to the callback
*
- * Find a given string in a string array and if it is found return the
- * index back.
+ * Execute a given callback on a string array values and returns the callback
+ * return value.
*
* Return: %0 if the property was found (success),
* %-EINVAL if given arguments are not valid,
@@ -421,8 +422,10 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string);
* %-EPROTO if the property is not an array of strings,
* %-ENXIO if no suitable firmware interface is present.
*/
-int fwnode_property_match_string(const struct fwnode_handle *fwnode,
- const char *propname, const char *string)
+static int fwnode_property_string_match(const struct fwnode_handle *fwnode,
+ const char *propname,
+ int (*cb)(const char **, int, void *),
+ void *data)
{
const char **values;
int nval, ret;
@@ -442,13 +445,46 @@ int fwnode_property_match_string(const struct fwnode_handle *fwnode,
if (ret < 0)
goto out;
+ ret = cb(values, nval, data);
+out:
+ kfree(values);
+ return ret;
+}
+
+static int match_string_callback(const char **values, int nval, void *data)
+{
+ int ret;
+ const char *string = data;
+
ret = match_string(values, nval, string);
if (ret < 0)
ret = -ENODATA;
-out:
- kfree(values);
+
return ret;
}
+
+/**
+ * fwnode_property_match_string - find a string in an array and return index
+ * @fwnode: Firmware node to get the property of
+ * @propname: Name of the property holding the array
+ * @string: String to look for
+ *
+ * Find a given string in a string array and if it is found return the
+ * index back.
+ *
+ * Return: %0 if the property was found (success),
+ * %-EINVAL if given arguments are not valid,
+ * %-ENODATA if the property does not have a value,
+ * %-EPROTO if the property is not an array of strings,
+ * %-ENXIO if no suitable firmware interface is present.
+ */
+int fwnode_property_match_string(const struct fwnode_handle *fwnode,
+ const char *propname, const char *string)
+{
+ return fwnode_property_string_match(fwnode, propname,
+ match_string_callback,
+ (void *)string);
+}
EXPORT_SYMBOL_GPL(fwnode_property_match_string);
/**
--
2.34.1
next prev parent reply other threads:[~2022-02-21 16:38 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 16:26 [RFC 00/10] add support for fwnode in i2c mux system and sfp Clément Léger
2022-02-21 16:26 ` [RFC 01/10] property: add fwnode_match_node() Clément Léger
2022-02-21 17:44 ` Andy Shevchenko
2022-02-22 8:14 ` Clément Léger
2022-02-21 16:26 ` [RFC 02/10] property: add fwnode_get_match_data() Clément Léger
2022-02-21 17:46 ` Andy Shevchenko
2022-02-22 8:19 ` Clément Léger
2022-02-22 8:33 ` Andy Shevchenko
2022-02-22 8:46 ` Clément Léger
2022-02-22 9:24 ` Andy Shevchenko
2022-02-22 9:47 ` Clément Léger
2022-02-22 10:20 ` Greg Kroah-Hartman
2022-02-22 15:16 ` Clément Léger
2022-02-21 16:26 ` [RFC 03/10] base: swnode: use fwnode_get_match_data() Clément Léger
2022-02-21 17:48 ` Andy Shevchenko
2022-02-22 8:39 ` Clément Léger
2022-02-23 15:05 ` Sakari Ailus
2022-02-23 15:15 ` Clément Léger
2022-02-23 15:21 ` Sakari Ailus
2022-02-21 16:26 ` Clément Léger [this message]
2022-02-21 17:51 ` [RFC 04/10] property: add a callback parameter to fwnode_property_match_string() Andy Shevchenko
2022-02-21 16:26 ` [RFC 05/10] property: add fwnode_property_read_string_index() Clément Léger
2022-02-21 16:26 ` [RFC 06/10] i2c: fwnode: add fwnode_find_i2c_adapter_by_node() Clément Léger
2022-02-21 18:00 ` Andy Shevchenko
2022-02-21 16:26 ` [RFC 07/10] i2c: of: use fwnode_get_i2c_adapter_by_node() Clément Léger
2022-02-21 16:26 ` [RFC 08/10] i2c: mux: pinctrl: remove CONFIG_OF dependency and use fwnode API Clément Léger
2022-02-21 16:26 ` [RFC 09/10] i2c: mux: add support for fwnode Clément Léger
2022-02-21 17:55 ` Andy Shevchenko
2022-02-22 8:53 ` Clément Léger
2022-02-22 10:57 ` Andrew Lunn
2022-02-22 20:31 ` Alexandre Belloni
2022-02-21 16:26 ` [RFC 10/10] net: sfp: " Clément Léger
2022-02-21 16:45 ` Russell King (Oracle)
2022-02-21 17:57 ` Andy Shevchenko
2022-02-22 13:25 ` Clément Léger
2022-02-23 11:22 ` Andy Shevchenko
2022-02-23 12:02 ` Hans de Goede
2022-02-23 12:31 ` Andrew Lunn
2022-02-23 12:41 ` Russell King (Oracle)
2022-02-23 13:39 ` Hans de Goede
2022-02-23 14:14 ` Clément Léger
2022-02-23 15:23 ` Andrew Lunn
2022-02-23 15:27 ` Hans de Goede
2022-02-23 15:27 ` Hans de Goede
2022-02-23 15:36 ` Andy Shevchenko
2022-02-23 15:38 ` Clément Léger
2022-02-23 14:37 ` Andy Shevchenko
2022-02-21 17:41 ` [RFC 00/10] add support for fwnode in i2c mux system and sfp Andy Shevchenko
2022-02-22 16:30 ` Clément Léger
2022-02-23 14:46 ` Andy Shevchenko
2022-02-23 15:11 ` Clément Léger
2022-02-23 15:24 ` Andy Shevchenko
2022-02-23 17:41 ` Mark Brown
2022-02-23 17:59 ` Clément Léger
2022-02-23 18:12 ` Mark Brown
2022-02-23 18:19 ` Andy Shevchenko
2022-02-21 21:44 ` Andrew Lunn
2022-02-22 8:26 ` Andy Shevchenko
2022-02-22 8:57 ` Andrew Lunn
2022-02-22 9:20 ` Andy Shevchenko
2022-02-24 14:40 ` Clément Léger
2022-02-24 14:58 ` Hans de Goede
2022-02-24 15:33 ` Mark Brown
2022-02-24 18:14 ` Sakari Ailus
2022-02-24 18:39 ` Alexandre Belloni
2022-02-24 18:43 ` Mark Brown
2022-02-24 18:39 ` Mark Brown
2022-02-24 16:42 ` Clément Léger
2022-02-24 17:26 ` Mark Brown
2022-03-03 8:48 ` Clément Léger
2022-03-03 12:26 ` Mark Brown
2022-03-08 10:45 ` Clément Léger
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=20220221162652.103834-5-clement.leger@bootlin.com \
--to=clement.leger@bootlin.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=djrscally@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=peda@axentia.se \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=wsa@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).