patch-2.1.17 linux/arch/sparc/prom/tree.c

• Lines: 114
• Date: Thu Dec 19 11:03:33 1996
• Orig file: v2.1.16/linux/arch/sparc/prom/tree.c
• Orig date: Tue Nov 12 15:56:04 1996

diff -u --recursive --new-file v2.1.16/linux/arch/sparc/prom/tree.c linux/arch/sparc/prom/tree.c
@@ -1,4 +1,4 @@
-/* $Id: tree.c,v 1.12 1996/10/12 12:37:40 davem Exp $
+/* $Id: tree.c,v 1.13 1996/12/18 06:46:56 tridge Exp $
  * tree.c: Basic device tree traversal/scanning for the Linux
  *         prom library.
  *
@@ -27,11 +27,6 @@
 
 	save_flags(flags); cli();
 
-#if CONFIG_AP1000
-        printk("prom_getchild -> 0\n");
-	restore_flags(flags);
-        return 0;
-#else
 	if(node == -1) {
 		ret = 0;
 	} else {
@@ -46,7 +41,6 @@
 			     "memory");
 	restore_flags(flags);
 	return ret;
-#endif
 }
 
 /* Return the next sibling of node 'node' or zero if no more siblings
@@ -60,11 +54,6 @@
 
 	save_flags(flags); cli();
 
-#if CONFIG_AP1000
-        printk("prom_getsibling -> 0\n");
-	restore_flags(flags);
-        return 0;
-#else
 	if(node == -1) {
 		ret = 0;
 	} else {
@@ -79,7 +68,6 @@
 			     "memory");
 	restore_flags(flags);
 	return ret;
-#endif
 }
 
 /* Return the length in bytes of property 'prop' at node 'node'.
@@ -93,11 +81,6 @@
 
 	save_flags(flags); cli();
 
-#if CONFIG_AP1000
-        printk("prom_getproplen(%s) -> -1\n",prop);
-	restore_flags(flags);
-        return -1;
-#endif
 	if((!node) || (!prop))
 		ret = -1;
 	else
@@ -121,11 +104,6 @@
 
 	save_flags(flags); cli();
 
-#if CONFIG_AP1000
-        printk("prom_getproperty(%s) -> -1\n",prop);
-	restore_flags(flags);
-	return -1;
-#endif
 	plen = prom_getproplen(node, prop);
 	if((plen > bufsize) || (plen == 0) || (plen == -1))
 		ret = -1;
@@ -148,10 +126,6 @@
 {
 	static int intprop;
 
-#if CONFIG_AP1000
-        printk("prom_getint(%s) -> -1\n",prop);
-        return -1;
-#endif
 	if(prom_getproperty(node, prop, (char *) &intprop, sizeof(int)) != -1)
 		return intprop;
 
@@ -167,10 +141,6 @@
 {
 	int retval;
 
-#if CONFIG_AP1000
-        printk("prom_getintdefault(%s) -> 0\n",property);
-        return 0;
-#endif
 	retval = prom_getint(node, property);
 	if(retval == -1) return deflt;
 
@@ -183,10 +153,6 @@
 {
 	int retval;
 
-#if CONFIG_AP1000
-        printk("prom_getbool(%s) -> 0\n",prop);
-        return 0;
-#endif
 	retval = prom_getproplen(node, prop);
 	if(retval == -1) return 0;
 	return 1;
@@ -201,10 +167,6 @@
 {
 	int len;
 
-#if CONFIG_AP1000
-        printk("prom_getstring(%s) -> .\n",prop);
-        return;
-#endif
 	len = prom_getproperty(node, prop, user_buf, ubuf_size);
 	if(len != -1) return;
 	user_buf[0] = 0;