2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: David S. Miller <[email protected]> [ Upstream commit 17d70d6df0c4ea7a203b444001572a91ad9c2bef ] Unused. Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- arch/sparc/include/asm/oplib_32.h | 1 - arch/sparc/include/asm/oplib_64.h | 1 - arch/sparc/prom/tree_32.c | 15 --------------- arch/sparc/prom/tree_64.c | 18 ------------------ 4 files changed, 35 deletions(-) Index: linux-2.6.35.y/arch/sparc/include/asm/oplib_32.h =================================================================== --- linux-2.6.35.y.orig/arch/sparc/include/asm/oplib_32.h +++ linux-2.6.35.y/arch/sparc/include/asm/oplib_32.h @@ -238,7 +238,6 @@ extern int prom_node_has_property(int no extern int prom_setprop(int node, const char *prop_name, char *prop_value, int value_size); -extern int prom_pathtoinode(char *path); extern int prom_inst2pkg(int); /* Dorking with Bus ranges... */ Index: linux-2.6.35.y/arch/sparc/include/asm/oplib_64.h =================================================================== --- linux-2.6.35.y.orig/arch/sparc/include/asm/oplib_64.h +++ linux-2.6.35.y/arch/sparc/include/asm/oplib_64.h @@ -278,7 +278,6 @@ extern int prom_finddevice(const char *n extern int prom_setprop(int node, const char *prop_name, char *prop_value, int value_size); -extern int prom_pathtoinode(const char *path); extern int prom_inst2pkg(int); extern int prom_service_exists(const char *service_name); extern void prom_sun4v_guest_soft_state(void); Index: linux-2.6.35.y/arch/sparc/prom/tree_32.c =================================================================== --- linux-2.6.35.y.orig/arch/sparc/prom/tree_32.c +++ linux-2.6.35.y/arch/sparc/prom/tree_32.c @@ -341,18 +341,3 @@ int prom_inst2pkg(int inst) if (node == -1) return 0; return node; } - -/* Return 'node' assigned to a particular prom 'path' - * FIXME: Should work for v0 as well - */ -int prom_pathtoinode(char *path) -{ - int node, inst; - - inst = prom_devopen (path); - if (inst == -1) return 0; - node = prom_inst2pkg (inst); - prom_devclose (inst); - if (node == -1) return 0; - return node; -} Index: linux-2.6.35.y/arch/sparc/prom/tree_64.c =================================================================== --- linux-2.6.35.y.orig/arch/sparc/prom/tree_64.c +++ linux-2.6.35.y/arch/sparc/prom/tree_64.c @@ -374,24 +374,6 @@ inline int prom_inst2pkg(int inst) return node; } -/* Return 'node' assigned to a particular prom 'path' - * FIXME: Should work for v0 as well - */ -int -prom_pathtoinode(const char *path) -{ - int node, inst; - - inst = prom_devopen (path); - if (inst == 0) - return 0; - node = prom_inst2pkg(inst); - prom_devclose(inst); - if (node == -1) - return 0; - return node; -} - int prom_ihandle2path(int handle, char *buffer, int bufsize) { unsigned long args[7]; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
