Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 63897531cd75e66b2a62a2e872e74232e6b0b1ac..f2e649ff746f546b153d5ff1f64dc70958490c56 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -95,108 +95,6 @@ int __weak of_node_to_nid(struct device_node *np)
 }
 #endif
 
-#ifndef CONFIG_OF_DYNAMIC
-static void of_node_release(struct kobject *kobj)
-{
-       /* Without CONFIG_OF_DYNAMIC, no nodes gets freed */
-}
-#endif /* CONFIG_OF_DYNAMIC */
-
-struct kobj_type of_node_ktype = {
-       .release = of_node_release,
-};
-
-static ssize_t of_node_property_read(struct file *filp, struct kobject *kobj,
-                               struct bin_attribute *bin_attr, char *buf,
-                               loff_t offset, size_t count)
-{
-       struct property *pp = container_of(bin_attr, struct property, attr);
-       return memory_read_from_buffer(buf, count, &offset, pp->value, pp->length);
-}
-
-/* always return newly allocated name, caller must free after use */
-static const char *safe_name(struct kobject *kobj, const char *orig_name)
-{
-       const char *name = orig_name;
-       struct kernfs_node *kn;
-       int i = 0;
-
-       /* don't be a hero. After 16 tries give up */
-       while (i < 16 && (kn = sysfs_get_dirent(kobj->sd, name))) {
-               sysfs_put(kn);
-               if (name != orig_name)
-                       kfree(name);
-               name = kasprintf(GFP_KERNEL, "%s#%i", orig_name, ++i);
-       }
-
-       if (name == orig_name) {
-               name = kstrdup(orig_name, GFP_KERNEL);
-       } else {
-               pr_warn("Duplicate name in %s, renamed to \"%s\"\n",
-                       kobject_name(kobj), name);
-       }
-       return name;
-}
-
-int __of_add_property_sysfs(struct device_node *np, struct property *pp)
-{
-       int rc;
-
-       /* Important: Don't leak passwords */
-       bool secure = strncmp(pp->name, "security-", 9) == 0;
-
-       if (!IS_ENABLED(CONFIG_SYSFS))
-               return 0;
-
-       if (!of_kset || !of_node_is_attached(np))
-               return 0;
-
-       sysfs_bin_attr_init(&pp->attr);
-       pp->attr.attr.name = safe_name(&np->kobj, pp->name);
-       pp->attr.attr.mode = secure ? 0400 : 0444;
-       pp->attr.size = secure ? 0 : pp->length;
-       pp->attr.read = of_node_property_read;
-
-       rc = sysfs_create_bin_file(&np->kobj, &pp->attr);
-       WARN(rc, "error adding attribute %s to node %pOF\n", pp->name, np);
-       return rc;
-}
-
-int __of_attach_node_sysfs(struct device_node *np)
-{
-       const char *name;
-       struct kobject *parent;
-       struct property *pp;
-       int rc;
-
-       if (!IS_ENABLED(CONFIG_SYSFS))
-               return 0;
-
-       if (!of_kset)
-               return 0;
-
-       np->kobj.kset = of_kset;
-       if (!np->parent) {
-               /* Nodes without parents are new top level trees */
-               name = safe_name(&of_kset->kobj, "base");
-               parent = NULL;
-       } else {
-               name = safe_name(&np->parent->kobj, kbasename(np->full_name));
-               parent = &np->parent->kobj;
-       }
-       if (!name)
-               return -ENOMEM;
-       rc = kobject_add(&np->kobj, parent, "%s", name);
-       kfree(name);
-       if (rc)
-               return rc;
-
-       for_each_property_of_node(np, pp)
-               __of_add_property_sysfs(np, pp);
-
-       return 0;
-}
-
 void __init of_core_init(void)
 {
        struct device_node *np;
@@ -760,7 +658,7 @@ struct device_node *of_get_child_by_name(const struct device_node *node,
 }
 EXPORT_SYMBOL(of_get_child_by_name);
 
-static struct device_node *__of_find_node_by_path(struct device_node *parent,
+struct device_node *__of_find_node_by_path(struct device_node *parent,
                                                const char *path)
 {
        struct device_node *child;
@@ -1504,22 +1402,6 @@ int __of_remove_property(struct device_node *np, struct property *prop)
        return 0;
 }
 
-void __of_sysfs_remove_bin_file(struct device_node *np, struct property *prop)
-{
-       sysfs_remove_bin_file(&np->kobj, &prop->attr);
-       kfree(prop->attr.attr.name);
-}
-
-void __of_remove_property_sysfs(struct device_node *np, struct property *prop)
-{
-       if (!IS_ENABLED(CONFIG_SYSFS))
-               return;
-
-       /* at early boot, bail here and defer setup to of_init() */
-       if (of_kset && of_node_is_attached(np))
-               __of_sysfs_remove_bin_file(np, prop);
-}
-
 /**
  * of_remove_property - Remove a property from a node.
  *
@@ -1579,21 +1461,6 @@ int __of_update_property(struct device_node *np, struct property *newprop,
        return 0;
 }
 
-void __of_update_property_sysfs(struct device_node *np, struct property *newprop,
-               struct property *oldprop)
-{
-       if (!IS_ENABLED(CONFIG_SYSFS))
-               return;
-
-       /* At early boot, bail out and defer setup to of_init() */
-       if (!of_kset)
-               return;
-
-       if (oldprop)
-               __of_sysfs_remove_bin_file(np, oldprop);
-       __of_add_property_sysfs(np, newprop);
-}
-
 /*
  * of_update_property - Update a property in a node, if the property does
  * not exist, add it.