[SPARC]: Kill prom_getname, unused and not implemented properly.

The m68k port's sun3 asm/oplib.h had a stray reference too, so I killed that off as well. Signed-off-by: David S. Miller <davem@davemloft.net>

[SPARC]: Kill prom_getname, unused and not implemented properly.
The m68k port's sun3 asm/oplib.h had a stray reference too, so I killed that off as well. Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller
1 parent 46ba6d7d8b
Showing 7 changed files with 0 additions and 120 deletions Side-by-side Diff
arch/sparc/kernel/sparc_ksyms.c
arch/sparc/prom/tree.c
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/prom/tree.c
include/asm-m68k/oplib.h
include/asm-sparc/oplib.h
include/asm-sparc64/oplib.h
@@ -237,7 +237,6 @@
 EXPORT_SYMBOL(prom_setprop);
 EXPORT_SYMBOL(saved_command_line);
 EXPORT_SYMBOL(prom_apply_obio_ranges);
-EXPORT_SYMBOL(prom_getname);
 EXPORT_SYMBOL(prom_feval);
 EXPORT_SYMBOL(prom_getbool);
 EXPORT_SYMBOL(prom_getstring);
@@ -205,24 +205,6 @@
 	return 0;
 }
  
-/* Gets name in the form prom v2+ uses it (name@x,yyyyy or name (if no reg)) */
-int prom_getname (int node, char *buffer, int len)
-{
-	int i;
-	struct linux_prom_registers reg[PROMREG_MAX];
-	
-	i = prom_getproperty (node, "name", buffer, len);
-	if (i <= 0) return -1;
-	buffer [i] = 0;
-	len -= i;
-	i = prom_getproperty (node, "reg", (char *)reg, sizeof (reg));
-	if (i <= 0) return 0;
-	if (len < 11) return -1;
-	buffer = strchr (buffer, 0);
-	sprintf (buffer, "@%x,%x", reg[0].which_io, (uint)reg[0].phys_addr);
-	return 0;
-}
-
 /* Interal version of nextprop that does not alter return values. */
 char * __prom_nextprop(int node, char * oprop)
 {
@@ -254,7 +254,6 @@
 EXPORT_SYMBOL(prom_node_has_property);
 EXPORT_SYMBOL(prom_setprop);
 EXPORT_SYMBOL(saved_command_line);
-EXPORT_SYMBOL(prom_getname);
 EXPORT_SYMBOL(prom_finddevice);
 EXPORT_SYMBOL(prom_feval);
 EXPORT_SYMBOL(prom_getbool);
@@ -193,91 +193,6 @@
 	return 0;
 }
  
-/* Gets name in the {name@x,yyyyy|name (if no reg)} form */
-int 
-prom_getname (int node, char *buffer, int len)
-{
-	int i, sbus = 0;
-	int pci = 0, ebus = 0, ide = 0;
-	struct linux_prom_registers *reg;
-	struct linux_prom64_registers reg64[PROMREG_MAX];
-	
-	for (sbus = prom_getparent (node); sbus; sbus = prom_getparent (sbus)) {
-		i = prom_getproperty (sbus, "name", buffer, len);
-		if (i > 0) {
-			buffer [i] = 0;
-			if (!strcmp (buffer, "sbus"))
-				goto getit;
-		}
-	}
-	if ((pci = prom_getparent (node))) {
-		i = prom_getproperty (pci, "name", buffer, len);
-		if (i > 0) {
-			buffer [i] = 0;
-			if (!strcmp (buffer, "pci"))
-				goto getit;
-		}
-		pci = 0;
-	}
-	if ((ebus = prom_getparent (node))) {
-		i = prom_getproperty (ebus, "name", buffer, len);
-		if (i > 0) {
-			buffer[i] = 0;
-			if (!strcmp (buffer, "ebus"))
-				goto getit;
-		}
-		ebus = 0;
-	}
-	if ((ide = prom_getparent (node))) {
-		i = prom_getproperty (ide, "name", buffer, len);
-		if (i > 0) {
-			buffer [i] = 0;
-			if (!strcmp (buffer, "ide"))
-				goto getit;
-		}
-		ide = 0;
-	}
-getit:
-	i = prom_getproperty (node, "name", buffer, len);
-	if (i <= 0) {
-		buffer [0] = 0;
-		return -1;
-	}
-	buffer [i] = 0;
-	len -= i;
-	i = prom_getproperty (node, "reg", (char *)reg64, sizeof (reg64));
-	if (i <= 0) return 0;
-	if (len < 16) return -1;
-	buffer = strchr (buffer, 0);
-	if (sbus) {
-		reg = (struct linux_prom_registers *)reg64;
-		sprintf (buffer, "@%x,%x", reg[0].which_io, (uint)reg[0].phys_addr);
-	} else if (pci) {
-		int dev, fn;
-		reg = (struct linux_prom_registers *)reg64;
-		fn = (reg[0].which_io >> 8) & 0x07;
-		dev = (reg[0].which_io >> 11) & 0x1f;
-		if (fn)
-			sprintf (buffer, "@%x,%x", dev, fn);
-		else
-			sprintf (buffer, "@%x", dev);
-	} else if (ebus) {
-		reg = (struct linux_prom_registers *)reg64;
-		sprintf (buffer, "@%x,%x", reg[0].which_io, reg[0].phys_addr);
-	} else if (ide) {
-		reg = (struct linux_prom_registers *)reg64;
-		sprintf (buffer, "@%x,%x", reg[0].which_io, reg[0].phys_addr);
-	} else if (i == 4) {	/* Happens on 8042's children on Ultra/PCI. */
-		reg = (struct linux_prom_registers *)reg64;
-		sprintf (buffer, "@%x", reg[0].which_io);
-	} else {
-		sprintf (buffer, "@%x,%x",
-			 (unsigned int)(reg64[0].phys_addr >> 36),
-			 (unsigned int)(reg64[0].phys_addr));
-	}
-	return 0;
-}
-
 /* Return the first property type for node 'node'.
  * buffer should be at least 32B in length
  */
@@ -244,11 +244,6 @@
 /* Does the passed node have the given "name"? YES=1 NO=0 */
 extern int prom_nodematch(int thisnode, char *name);
  
-/* Puts in buffer a prom name in the form name@x,y or name (x for which_io
- * and y for first regs phys address
- */
-extern int prom_getname(int node, char *buf, int buflen);
-
 /* Search all siblings starting at the passed node for "name" matching
  * the given string.  Returns the node on success, zero on failure.
  */
@@ -267,11 +267,6 @@
 /* Does the passed node have the given "name"? YES=1 NO=0 */
 extern int prom_nodematch(int thisnode, char *name);
  
-/* Puts in buffer a prom name in the form name@x,y or name (x for which_io 
- * and y for first regs phys address
- */
-extern int prom_getname(int node, char *buf, int buflen);
-
 /* Search all siblings starting at the passed node for "name" matching
  * the given string.  Returns the node on success, zero on failure.
  */
@@ -287,11 +287,6 @@
 /* Does the passed node have the given "name"? YES=1 NO=0 */
 extern int prom_nodematch(int thisnode, const char *name);
  
-/* Puts in buffer a prom name in the form name@x,y or name (x for which_io 
- * and y for first regs phys address
- */
-extern int prom_getname(int node, char *buf, int buflen);
-
 /* Search all siblings starting at the passed node for "name" matching
  * the given string.  Returns the node on success, zero on failure.
  */
...	...	@@ -237,7 +237,6 @@
237	237	EXPORT_SYMBOL(prom_setprop);
238	238	EXPORT_SYMBOL(saved_command_line);
239	239	EXPORT_SYMBOL(prom_apply_obio_ranges);
240		-EXPORT_SYMBOL(prom_getname);
241	240	EXPORT_SYMBOL(prom_feval);
242	241	EXPORT_SYMBOL(prom_getbool);
243	242	EXPORT_SYMBOL(prom_getstring);
...	...	@@ -205,24 +205,6 @@
205	205	return 0;
206	206	}
207	207
208		-/* Gets name in the form prom v2+ uses it (name@x,yyyyy or name (if no reg)) */
209		-int prom_getname (int node, char *buffer, int len)
210		-{
211		- int i;
212		- struct linux_prom_registers reg[PROMREG_MAX];
213		-
214		- i = prom_getproperty (node, "name", buffer, len);
215		- if (i <= 0) return -1;
216		- buffer [i] = 0;
217		- len -= i;
218		- i = prom_getproperty (node, "reg", (char *)reg, sizeof (reg));
219		- if (i <= 0) return 0;
220		- if (len < 11) return -1;
221		- buffer = strchr (buffer, 0);
222		- sprintf (buffer, "@%x,%x", reg[0].which_io, (uint)reg[0].phys_addr);
223		- return 0;
224		-}
225		-
226	208	/* Interal version of nextprop that does not alter return values. */
227	209	char * __prom_nextprop(int node, char * oprop)
228	210	{
...	...	@@ -254,7 +254,6 @@
254	254	EXPORT_SYMBOL(prom_node_has_property);
255	255	EXPORT_SYMBOL(prom_setprop);
256	256	EXPORT_SYMBOL(saved_command_line);
257		-EXPORT_SYMBOL(prom_getname);
258	257	EXPORT_SYMBOL(prom_finddevice);
259	258	EXPORT_SYMBOL(prom_feval);
260	259	EXPORT_SYMBOL(prom_getbool);
...	...	@@ -193,91 +193,6 @@
193	193	return 0;
194	194	}
195	195
196		-/* Gets name in the {name@x,yyyyy\|name (if no reg)} form */
197		-int
198		-prom_getname (int node, char *buffer, int len)
199		-{
200		- int i, sbus = 0;
201		- int pci = 0, ebus = 0, ide = 0;
202		- struct linux_prom_registers *reg;
203		- struct linux_prom64_registers reg64[PROMREG_MAX];
204		-
205		- for (sbus = prom_getparent (node); sbus; sbus = prom_getparent (sbus)) {
206		- i = prom_getproperty (sbus, "name", buffer, len);
207		- if (i > 0) {
208		- buffer [i] = 0;
209		- if (!strcmp (buffer, "sbus"))
210		- goto getit;
211		- }
212		- }
213		- if ((pci = prom_getparent (node))) {
214		- i = prom_getproperty (pci, "name", buffer, len);
215		- if (i > 0) {
216		- buffer [i] = 0;
217		- if (!strcmp (buffer, "pci"))
218		- goto getit;
219		- }
220		- pci = 0;
221		- }
222		- if ((ebus = prom_getparent (node))) {
223		- i = prom_getproperty (ebus, "name", buffer, len);
224		- if (i > 0) {
225		- buffer[i] = 0;
226		- if (!strcmp (buffer, "ebus"))
227		- goto getit;
228		- }
229		- ebus = 0;
230		- }
231		- if ((ide = prom_getparent (node))) {
232		- i = prom_getproperty (ide, "name", buffer, len);
233		- if (i > 0) {
234		- buffer [i] = 0;
235		- if (!strcmp (buffer, "ide"))
236		- goto getit;
237		- }
238		- ide = 0;
239		- }
240		-getit:
241		- i = prom_getproperty (node, "name", buffer, len);
242		- if (i <= 0) {
243		- buffer [0] = 0;
244		- return -1;
245		- }
246		- buffer [i] = 0;
247		- len -= i;
248		- i = prom_getproperty (node, "reg", (char *)reg64, sizeof (reg64));
249		- if (i <= 0) return 0;
250		- if (len < 16) return -1;
251		- buffer = strchr (buffer, 0);
252		- if (sbus) {
253		- reg = (struct linux_prom_registers *)reg64;
254		- sprintf (buffer, "@%x,%x", reg[0].which_io, (uint)reg[0].phys_addr);
255		- } else if (pci) {
256		- int dev, fn;
257		- reg = (struct linux_prom_registers *)reg64;
258		- fn = (reg[0].which_io >> 8) & 0x07;
259		- dev = (reg[0].which_io >> 11) & 0x1f;
260		- if (fn)
261		- sprintf (buffer, "@%x,%x", dev, fn);
262		- else
263		- sprintf (buffer, "@%x", dev);
264		- } else if (ebus) {
265		- reg = (struct linux_prom_registers *)reg64;
266		- sprintf (buffer, "@%x,%x", reg[0].which_io, reg[0].phys_addr);
267		- } else if (ide) {
268		- reg = (struct linux_prom_registers *)reg64;
269		- sprintf (buffer, "@%x,%x", reg[0].which_io, reg[0].phys_addr);
270		- } else if (i == 4) { /* Happens on 8042's children on Ultra/PCI. */
271		- reg = (struct linux_prom_registers *)reg64;
272		- sprintf (buffer, "@%x", reg[0].which_io);
273		- } else {
274		- sprintf (buffer, "@%x,%x",
275		- (unsigned int)(reg64[0].phys_addr >> 36),
276		- (unsigned int)(reg64[0].phys_addr));
277		- }
278		- return 0;
279		-}
280		-
281	196	/* Return the first property type for node 'node'.
282	197	* buffer should be at least 32B in length
283	198	*/
...	...	@@ -244,11 +244,6 @@
244	244	/* Does the passed node have the given "name"? YES=1 NO=0 */
245	245	extern int prom_nodematch(int thisnode, char *name);
246	246
247		-/* Puts in buffer a prom name in the form name@x,y or name (x for which_io
248		- * and y for first regs phys address
249		- */
250		-extern int prom_getname(int node, char *buf, int buflen);
251		-
252	247	/* Search all siblings starting at the passed node for "name" matching
253	248	* the given string. Returns the node on success, zero on failure.
254	249	*/
...	...	@@ -267,11 +267,6 @@
267	267	/* Does the passed node have the given "name"? YES=1 NO=0 */
268	268	extern int prom_nodematch(int thisnode, char *name);
269	269
270		-/* Puts in buffer a prom name in the form name@x,y or name (x for which_io
271		- * and y for first regs phys address
272		- */
273		-extern int prom_getname(int node, char *buf, int buflen);
274		-
275	270	/* Search all siblings starting at the passed node for "name" matching
276	271	* the given string. Returns the node on success, zero on failure.
277	272	*/
...	...	@@ -287,11 +287,6 @@
287	287	/* Does the passed node have the given "name"? YES=1 NO=0 */
288	288	extern int prom_nodematch(int thisnode, const char *name);
289	289
290		-/* Puts in buffer a prom name in the form name@x,y or name (x for which_io
291		- * and y for first regs phys address
292		- */
293		-extern int prom_getname(int node, char *buf, int buflen);
294		-
295	290	/* Search all siblings starting at the passed node for "name" matching
296	291	* the given string. Returns the node on success, zero on failure.
297	292	*/