backports: fix compilation with CONFIG_OF

There are two users of of_find_property_value_of_size() which is
originally static in the kernel, but we need it exposed (but not
exported) so that multiple backport files can use it; do that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/backport/backport-include/linux/of.h b/backport/backport-include/linux/of.h
index e60005540e120d536922e8f0d7d06aa4f8302d04..e7f7ea741b9302d88ed43ebf1ceb25cb96df5a7a 100644 (file)
--- a/backport/backport-include/linux/of.h
+++ b/backport/backport-include/linux/of.h
@@ -52,6 +52,9 @@ static inline int of_property_read_u8_array(const struct device_node *np,
 extern int of_property_read_u32_index(const struct device_node *np,
                                       const char *propname,
                                       u32 index, u32 *out_value);
+/* This is static in the kernel, but we need it in multiple places */
+void *of_find_property_value_of_size(const struct device_node *np,
+                                    const char *propname, u32 len);
 #else
 static inline int of_property_read_u32_index(const struct device_node *np,
                        const char *propname, u32 index, u32 *out_value)

diff --git a/backport/compat/backport-3.10.c b/backport/compat/backport-3.10.c
index 2e64228212ddae50ca5b2998b35e35c3808a27aa..c7a1c182a9d1766404a129a7202f5b85973c95e3 100644 (file)
--- a/backport/compat/backport-3.10.c
+++ b/backport/compat/backport-3.10.c
@@ -177,6 +177,34 @@ EXPORT_SYMBOL_GPL(pci_vfs_assigned);
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) */
 
 #ifdef CONFIG_OF
+/**
+ * of_find_property_value_of_size
+ *
+ * @np:                device node from which the property value is to be read.
+ * @propname:  name of the property to be searched.
+ * @len:       requested length of property value
+ *
+ * Search for a property in a device node and valid the requested size.
+ * Returns the property value on success, -EINVAL if the property does not
+ *  exist, -ENODATA if property does not have a value, and -EOVERFLOW if the
+ * property data isn't large enough.
+ *
+ */
+void *of_find_property_value_of_size(const struct device_node *np,
+                                    const char *propname, u32 len)
+{
+       struct property *prop = of_find_property(np, propname, NULL);
+
+       if (!prop)
+               return ERR_PTR(-EINVAL);
+       if (!prop->value)
+               return ERR_PTR(-ENODATA);
+       if (len > prop->length)
+               return ERR_PTR(-EOVERFLOW);
+
+       return prop->value;
+}
+
 /**
  * of_property_read_u32_index - Find and read a u32 from a multi-value property.
  *

diff --git a/backport/compat/compat-3.8.c b/backport/compat/compat-3.8.c
index d39e8d6728c9a2e8fc87d34781626e3878000662..49dc44bd4664c6aa1dcf9e7cc72b108775e36608 100644 (file)
--- a/backport/compat/compat-3.8.c
+++ b/backport/compat/compat-3.8.c
@@ -456,34 +456,6 @@ void prandom_bytes(void *buf, int bytes)
 EXPORT_SYMBOL_GPL(prandom_bytes);
 
 #ifdef CONFIG_OF
-/**
- * of_find_property_value_of_size
- *
- * @np:                device node from which the property value is to be read.
- * @propname:  name of the property to be searched.
- * @len:       requested length of property value
- *
- * Search for a property in a device node and valid the requested size.
- * Returns the property value on success, -EINVAL if the property does not
- *  exist, -ENODATA if property does not have a value, and -EOVERFLOW if the
- * property data isn't large enough.
- *
- */
-static void *of_find_property_value_of_size(const struct device_node *np,
-                       const char *propname, u32 len)
-{
-       struct property *prop = of_find_property(np, propname, NULL);
-
-       if (!prop)
-               return ERR_PTR(-EINVAL);
-       if (!prop->value)
-               return ERR_PTR(-ENODATA);
-       if (len > prop->length)
-               return ERR_PTR(-EOVERFLOW);
-
-       return prop->value;
-}
-
 /**
  * of_property_read_u8_array - Find and read an array of u8 from a property.
  *