]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
device property: Move property_entry_free_data() upper
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 22 Jan 2018 14:21:37 +0000 (16:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2018 12:40:40 +0000 (13:40 +0100)
It's just a preparatory patch to use property_entry_free_data() later on.

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/property.c

index 1ddf769ab8f7ae8f3b2d45b2eb6bb4c47c6562eb..39393b4806d1fa1df0220a3bd8e14cb43f0dcd55 100644 (file)
@@ -695,6 +695,23 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
 }
 EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
 
+static void property_entry_free_data(const struct property_entry *p)
+{
+       size_t i, nval;
+
+       if (p->is_array) {
+               if (p->is_string && p->pointer.str) {
+                       nval = p->length / sizeof(const char *);
+                       for (i = 0; i < nval; i++)
+                               kfree(p->pointer.str[i]);
+               }
+               kfree(p->pointer.raw_data);
+       } else if (p->is_string) {
+               kfree(p->value.str);
+       }
+       kfree(p->name);
+}
+
 static int property_copy_string_array(struct property_entry *dst,
                                      const struct property_entry *src)
 {
@@ -768,23 +785,6 @@ out_free_name:
        return error;
 }
 
-static void property_entry_free_data(const struct property_entry *p)
-{
-       size_t i, nval;
-
-       if (p->is_array) {
-               if (p->is_string && p->pointer.str) {
-                       nval = p->length / sizeof(const char *);
-                       for (i = 0; i < nval; i++)
-                               kfree(p->pointer.str[i]);
-               }
-               kfree(p->pointer.raw_data);
-       } else if (p->is_string) {
-               kfree(p->value.str);
-       }
-       kfree(p->name);
-}
-
 /**
  * property_entries_dup - duplicate array of properties
  * @properties: array of properties to copy