2 files changed, 0 insertions, 122 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 06d620ab4168..0db8ee64ffe6 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -50,67 +50,6 @@ typedef u32 cell_t;
 /* export that to outside world */
 struct device_node *of_chosen;
-/**
- * This function is used to scan the flattened device-tree, it is
- * used to extract the memory informations at boot before we can
- * unflatten the tree
- */
-int __init of_scan_flat_dt(int (*it)(unsigned long node,
-                                     const char *uname, int depth,
-                                     void *data),
-                           void *data)
-{
-        unsigned long p = ((unsigned long)initial_boot_params) +
-                initial_boot_params->off_dt_struct;
-        int rc = 0;
-        int depth = -1;
-        do {
-                u32 tag = *((u32 *)p);
-                char *pathp;
-                p += 4;
-                if (tag == OF_DT_END_NODE) {
-                        depth--;
-                        continue;
-                }
-                if (tag == OF_DT_NOP)
-                        continue;
-                if (tag == OF_DT_END)
-                        break;
-                if (tag == OF_DT_PROP) {
-                        u32 sz = *((u32 *)p);
-                        p += 8;
-                        if (initial_boot_params->version < 0x10)
-                                p = _ALIGN(p, sz >= 8 ? 8 : 4);
-                        p += sz;
-                        p = _ALIGN(p, 4);
-                        continue;
-                }
-                if (tag != OF_DT_BEGIN_NODE) {
-                        printk(KERN_WARNING "Invalid tag %x scanning flattened"
-                                " device tree !\n", tag);
-                        return -EINVAL;
-                }
-                depth++;
-                pathp = (char *)p;
-                p = _ALIGN(p + strlen(pathp) + 1, 4);
-                if ((*pathp) == '/') {
-                        char *lp, *np;
-                        for (lp = NULL, np = pathp; *np; np++)
-                                if ((*np) == '/')
-                                        lp = np+1;
-                        if (lp != NULL)
-                                pathp = lp;
-                }
-                rc = it(p, pathp, depth, data);
-                if (rc != 0)
-                        break;
-        } while (1);
-        return rc;
-}
 unsigned long __init of_get_flat_dt_root(void)
 {
        unsigned long p = ((unsigned long)initial_boot_params) +
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index fccf7e49bb28..14a07b9e00d1 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -80,67 +80,6 @@ extern rwlock_t devtree_lock;	/* temporary while merging */
 /* export that to outside world */
 struct device_node *of_chosen;
-/**
- * This function is used to scan the flattened device-tree, it is
- * used to extract the memory informations at boot before we can
- * unflatten the tree
- */
-int __init of_scan_flat_dt(int (*it)(unsigned long node,
-                                     const char *uname, int depth,
-                                     void *data),
-                           void *data)
-{
-        unsigned long p = ((unsigned long)initial_boot_params) +
-                initial_boot_params->off_dt_struct;
-        int rc = 0;
-        int depth = -1;
-        do {
-                u32 tag = *((u32 *)p);
-                char *pathp;
-                
-                p += 4;
-                if (tag == OF_DT_END_NODE) {
-                        depth --;
-                        continue;
-                }
-                if (tag == OF_DT_NOP)
-                        continue;
-                if (tag == OF_DT_END)
-                        break;
-                if (tag == OF_DT_PROP) {
-                        u32 sz = *((u32 *)p);
-                        p += 8;
-                        if (initial_boot_params->version < 0x10)
-                                p = _ALIGN(p, sz >= 8 ? 8 : 4);
-                        p += sz;
-                        p = _ALIGN(p, 4);
-                        continue;
-                }
-                if (tag != OF_DT_BEGIN_NODE) {
-                        printk(KERN_WARNING "Invalid tag %x scanning flattened"
-                               " device tree !\n", tag);
-                        return -EINVAL;
-                }
-                depth++;
-                pathp = (char *)p;
-                p = _ALIGN(p + strlen(pathp) + 1, 4);
-                if ((*pathp) == '/') {
-                        char *lp, *np;
-                        for (lp = NULL, np = pathp; *np; np++)
-                                if ((*np) == '/')
-                                        lp = np+1;
-                        if (lp != NULL)
-                                pathp = lp;
-                }
-                rc = it(p, pathp, depth, data);
-                if (rc != 0)
-                        break;          
-        } while(1);
-        return rc;
-}
 unsigned long __init of_get_flat_dt_root(void)
 {
        unsigned long p = ((unsigned long)initial_boot_params) +

diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 06d620ab4168..0db8ee64ffe6 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c
@@ -50,67 +50,6 @@ typedef u32 cell_t;
50	/* export that to outside world */	50	/* export that to outside world */
51	struct device_node *of_chosen;	51	struct device_node *of_chosen;
52		52
53	/**
54	* This function is used to scan the flattened device-tree, it is
55	* used to extract the memory informations at boot before we can
56	* unflatten the tree
57	*/
58	int __init of_scan_flat_dt(int (*it)(unsigned long node,
59	const char *uname, int depth,
60	void *data),
61	void *data)
62	{
63	unsigned long p = ((unsigned long)initial_boot_params) +
64	initial_boot_params->off_dt_struct;
65	int rc = 0;
66	int depth = -1;
67
68	do {
69	u32 tag = ((u32 )p);
70	char *pathp;
71
72	p += 4;
73	if (tag == OF_DT_END_NODE) {
74	depth--;
75	continue;
76	}
77	if (tag == OF_DT_NOP)
78	continue;
79	if (tag == OF_DT_END)
80	break;
81	if (tag == OF_DT_PROP) {
82	u32 sz = ((u32 )p);
83	p += 8;
84	if (initial_boot_params->version < 0x10)
85	p = _ALIGN(p, sz >= 8 ? 8 : 4);
86	p += sz;
87	p = _ALIGN(p, 4);
88	continue;
89	}
90	if (tag != OF_DT_BEGIN_NODE) {
91	printk(KERN_WARNING "Invalid tag %x scanning flattened"
92	" device tree !\n", tag);
93	return -EINVAL;
94	}
95	depth++;
96	pathp = (char *)p;
97	p = _ALIGN(p + strlen(pathp) + 1, 4);
98	if ((*pathp) == '/') {
99	char lp, np;
100	for (lp = NULL, np = pathp; *np; np++)
101	if ((*np) == '/')
102	lp = np+1;
103	if (lp != NULL)
104	pathp = lp;
105	}
106	rc = it(p, pathp, depth, data);
107	if (rc != 0)
108	break;
109	} while (1);
110
111	return rc;
112	}
113
114	unsigned long __init of_get_flat_dt_root(void)	53	unsigned long __init of_get_flat_dt_root(void)
115	{	54	{
116	unsigned long p = ((unsigned long)initial_boot_params) +	55	unsigned long p = ((unsigned long)initial_boot_params) +


diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index fccf7e49bb28..14a07b9e00d1 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c
@@ -80,67 +80,6 @@ extern rwlock_t devtree_lock; /* temporary while merging */
80	/* export that to outside world */	80	/* export that to outside world */
81	struct device_node *of_chosen;	81	struct device_node *of_chosen;
82		82
83	/**
84	* This function is used to scan the flattened device-tree, it is
85	* used to extract the memory informations at boot before we can
86	* unflatten the tree
87	*/
88	int __init of_scan_flat_dt(int (*it)(unsigned long node,
89	const char *uname, int depth,
90	void *data),
91	void *data)
92	{
93	unsigned long p = ((unsigned long)initial_boot_params) +
94	initial_boot_params->off_dt_struct;
95	int rc = 0;
96	int depth = -1;
97
98	do {
99	u32 tag = ((u32 )p);
100	char *pathp;
101
102	p += 4;
103	if (tag == OF_DT_END_NODE) {
104	depth --;
105	continue;
106	}
107	if (tag == OF_DT_NOP)
108	continue;
109	if (tag == OF_DT_END)
110	break;
111	if (tag == OF_DT_PROP) {
112	u32 sz = ((u32 )p);
113	p += 8;
114	if (initial_boot_params->version < 0x10)
115	p = _ALIGN(p, sz >= 8 ? 8 : 4);
116	p += sz;
117	p = _ALIGN(p, 4);
118	continue;
119	}
120	if (tag != OF_DT_BEGIN_NODE) {
121	printk(KERN_WARNING "Invalid tag %x scanning flattened"
122	" device tree !\n", tag);
123	return -EINVAL;
124	}
125	depth++;
126	pathp = (char *)p;
127	p = _ALIGN(p + strlen(pathp) + 1, 4);
128	if ((*pathp) == '/') {
129	char lp, np;
130	for (lp = NULL, np = pathp; *np; np++)
131	if ((*np) == '/')
132	lp = np+1;
133	if (lp != NULL)
134	pathp = lp;
135	}
136	rc = it(p, pathp, depth, data);
137	if (rc != 0)
138	break;
139	} while(1);
140
141	return rc;
142	}
143
144	unsigned long __init of_get_flat_dt_root(void)	83	unsigned long __init of_get_flat_dt_root(void)
145	{	84	{
146	unsigned long p = ((unsigned long)initial_boot_params) +	85	unsigned long p = ((unsigned long)initial_boot_params) +