of/fdt: remove unused of_scan_flat_dt_by_path

of_scan_flat_dt_by_path is unused anywhere in the kernel, so remove it.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
(cherry picked from commit bba04d965d06abbbe10afd3687742389107e198e)
Signed-off-by: Mark Brown <broonie@linaro.org>
Conflicts:
	drivers/of/fdt.c

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index f6241a50cc907b9c6fa8d11429c41fdc5eeaa248..776c62feee13640236207aabeb2e614bc4409429 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -678,73 +678,6 @@ struct fdt_scan_status {
        void *data;
 };
 
-/**
- * fdt_scan_node_by_path - iterator for of_scan_flat_dt_by_path function
- */
-static int __init fdt_scan_node_by_path(unsigned long node, const char *uname,
-                                       int depth, void *data)
-{
-       struct fdt_scan_status *st = data;
-
-       /*
-        * if scan at the requested fdt node has been completed,
-        * return -ENXIO to abort further scanning
-        */
-       if (depth <= st->depth)
-               return -ENXIO;
-
-       /* requested fdt node has been found, so call iterator function */
-       if (st->found)
-               return st->iterator(node, uname, depth, st->data);
-
-       /* check if scanning automata is entering next level of fdt nodes */
-       if (depth == st->depth + 1 &&
-           strncmp(st->name, uname, st->namelen) == 0 &&
-           uname[st->namelen] == 0) {
-               st->depth += 1;
-               if (st->name[st->namelen] == 0) {
-                       st->found = 1;
-               } else {
-                       const char *next = st->name + st->namelen + 1;
-                       st->name = next;
-                       st->namelen = strcspn(next, "/");
-               }
-               return 0;
-       }
-
-       /* scan next fdt node */
-       return 0;
-}
-
-/**
- * of_scan_flat_dt_by_path - scan flattened tree blob and call callback on each
- *                          child of the given path.
- * @path: path to start searching for children
- * @it: callback function
- * @data: context data pointer
- *
- * This function is used to scan the flattened device-tree starting from the
- * node given by path. It is used to extract information (like reserved
- * memory), which is required on ealy boot before we can unflatten the tree.
- */
-int __init of_scan_flat_dt_by_path(const char *path,
-       int (*it)(unsigned long node, const char *name, int depth, void *data),
-       void *data)
-{
-       struct fdt_scan_status st = {path, 0, -1, 0, it, data};
-       int ret = 0;
-
-       if (initial_boot_params)
-                ret = of_scan_flat_dt(fdt_scan_node_by_path, &st);
-
-       if (!st.found)
-               return -ENOENT;
-       else if (ret == -ENXIO) /* scan has been completed */
-               return 0;
-       else
-               return ret;
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 /**
  * early_init_dt_check_for_initrd - Decode initrd location from flat tree

diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index a792cb3d5ec80a3e3cd03d295417e3a2d3163188..ff627bddb9d3fa5d2c4c9e3e64c948683b450b6b 100644 (file)
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -90,9 +90,6 @@ extern void *of_get_flat_dt_prop(unsigned long node, const char *name,
 extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
 extern int of_flat_dt_match(unsigned long node, const char *const *matches);
 extern unsigned long of_get_flat_dt_root(void);
-extern int of_scan_flat_dt_by_path(const char *path,
-       int (*it)(unsigned long node, const char *name, int depth, void *data),
-       void *data);
 
 extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                     int depth, void *data);