treewide: remove files for building 5.10 kernel
[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 828-v6.4-0002-of-Update-of_device_get_modalias.patch
diff --git a/target/linux/generic/backport-5.10/828-v6.4-0002-of-Update-of_device_get_modalias.patch b/target/linux/generic/backport-5.10/828-v6.4-0002-of-Update-of_device_get_modalias.patch
deleted file mode 100644 (file)
index eac4ced..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-From 5c3d15e127ebfc0754cd18def7124633b6d46672 Mon Sep 17 00:00:00 2001
-From: Miquel Raynal <miquel.raynal@bootlin.com>
-Date: Tue, 4 Apr 2023 18:21:15 +0100
-Subject: [PATCH] of: Update of_device_get_modalias()
-
-This function only needs a "struct device_node" to work, but for
-convenience the author (and only user) of this helper did use a "struct
-device" and put it in device.c.
-
-Let's convert this helper to take a "struct device node" instead. This
-change asks for two additional changes: renaming it "of_modalias()"
-to fit the current naming, and moving it outside of device.c which will
-be done in a follow-up commit.
-
-Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
-Reviewed-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-Link: https://lore.kernel.org/r/20230404172148.82422-8-srinivas.kandagatla@linaro.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/of/device.c | 29 +++++++++++++++++------------
- 1 file changed, 17 insertions(+), 12 deletions(-)
-
---- a/drivers/of/device.c
-+++ b/drivers/of/device.c
-@@ -215,7 +215,7 @@ const void *of_device_get_match_data(con
- }
- EXPORT_SYMBOL(of_device_get_match_data);
--static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
-+static ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len)
- {
-       const char *compat;
-       char *c;
-@@ -223,19 +223,16 @@ static ssize_t of_device_get_modalias(st
-       ssize_t csize;
-       ssize_t tsize;
--      if ((!dev) || (!dev->of_node) || dev->of_node_reused)
--              return -ENODEV;
--
-       /* Name & Type */
-       /* %p eats all alphanum characters, so %c must be used here */
--      csize = snprintf(str, len, "of:N%pOFn%c%s", dev->of_node, 'T',
--                       of_node_get_device_type(dev->of_node));
-+      csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T',
-+                       of_node_get_device_type(np));
-       tsize = csize;
-       len -= csize;
-       if (str)
-               str += csize;
--      of_property_for_each_string(dev->of_node, "compatible", p, compat) {
-+      of_property_for_each_string(np, "compatible", p, compat) {
-               csize = strlen(compat) + 1;
-               tsize += csize;
-               if (csize > len)
-@@ -260,7 +257,10 @@ int of_device_request_module(struct devi
-       ssize_t size;
-       int ret;
--      size = of_device_get_modalias(dev, NULL, 0);
-+      if (!dev || !dev->of_node)
-+              return -ENODEV;
-+
-+      size = of_modalias(dev->of_node, NULL, 0);
-       if (size < 0)
-               return size;
-@@ -271,7 +271,7 @@ int of_device_request_module(struct devi
-       if (!str)
-               return -ENOMEM;
--      of_device_get_modalias(dev, str, size);
-+      of_modalias(dev->of_node, str, size);
-       str[size - 1] = '\0';
-       ret = request_module(str);
-       kfree(str);
-@@ -285,7 +285,12 @@ EXPORT_SYMBOL_GPL(of_device_request_modu
-  */
- ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len)
- {
--      ssize_t sl = of_device_get_modalias(dev, str, len - 2);
-+      ssize_t sl;
-+
-+      if (!dev || !dev->of_node || dev->of_node_reused)
-+              return -ENODEV;
-+
-+      sl = of_modalias(dev->of_node, str, len - 2);
-       if (sl < 0)
-               return sl;
-       if (sl > len - 2)
-@@ -348,8 +353,8 @@ int of_device_uevent_modalias(struct dev
-       if (add_uevent_var(env, "MODALIAS="))
-               return -ENOMEM;
--      sl = of_device_get_modalias(dev, &env->buf[env->buflen-1],
--                                  sizeof(env->buf) - env->buflen);
-+      sl = of_modalias(dev->of_node, &env->buf[env->buflen-1],
-+                       sizeof(env->buf) - env->buflen);
-       if (sl < 0)
-               return sl;
-       if (sl >= (sizeof(env->buf) - env->buflen))