diff options
| -rw-r--r-- | arch/sparc/include/asm/oplib_32.h | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/oplib_64.h | 1 | ||||
| -rw-r--r-- | arch/sparc/prom/tree_32.c | 16 | ||||
| -rw-r--r-- | arch/sparc/prom/tree_64.c | 18 |
4 files changed, 0 insertions, 36 deletions
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h index 51296a6f5005..b0f79beffc3b 100644 --- a/arch/sparc/include/asm/oplib_32.h +++ b/arch/sparc/include/asm/oplib_32.h | |||
| @@ -238,7 +238,6 @@ extern int prom_node_has_property(phandle node, char *property); | |||
| 238 | extern int prom_setprop(phandle node, const char *prop_name, char *prop_value, | 238 | extern int prom_setprop(phandle node, const char *prop_name, char *prop_value, |
| 239 | int value_size); | 239 | int value_size); |
| 240 | 240 | ||
| 241 | extern phandle prom_pathtoinode(char *path); | ||
| 242 | extern phandle prom_inst2pkg(int); | 241 | extern phandle prom_inst2pkg(int); |
| 243 | 242 | ||
| 244 | /* Dorking with Bus ranges... */ | 243 | /* Dorking with Bus ranges... */ |
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h index c9cc078e3e31..9b01a4b8ae18 100644 --- a/arch/sparc/include/asm/oplib_64.h +++ b/arch/sparc/include/asm/oplib_64.h | |||
| @@ -279,7 +279,6 @@ extern phandle prom_finddevice(const char *name); | |||
| 279 | extern int prom_setprop(phandle node, const char *prop_name, char *prop_value, | 279 | extern int prom_setprop(phandle node, const char *prop_name, char *prop_value, |
| 280 | int value_size); | 280 | int value_size); |
| 281 | 281 | ||
| 282 | extern phandle prom_pathtoinode(const char *path); | ||
| 283 | extern phandle prom_inst2pkg(int); | 282 | extern phandle prom_inst2pkg(int); |
| 284 | extern int prom_service_exists(const char *service_name); | 283 | extern int prom_service_exists(const char *service_name); |
| 285 | extern void prom_sun4v_guest_soft_state(void); | 284 | extern void prom_sun4v_guest_soft_state(void); |
diff --git a/arch/sparc/prom/tree_32.c b/arch/sparc/prom/tree_32.c index 63e08e149774..535e2e69ac1d 100644 --- a/arch/sparc/prom/tree_32.c +++ b/arch/sparc/prom/tree_32.c | |||
| @@ -342,19 +342,3 @@ phandle prom_inst2pkg(int inst) | |||
| 342 | if (node == -1) return 0; | 342 | if (node == -1) return 0; |
| 343 | return node; | 343 | return node; |
| 344 | } | 344 | } |
| 345 | |||
| 346 | /* Return 'node' assigned to a particular prom 'path' | ||
| 347 | * FIXME: Should work for v0 as well | ||
| 348 | */ | ||
| 349 | phandle prom_pathtoinode(char *path) | ||
| 350 | { | ||
| 351 | phandle node; | ||
| 352 | int inst; | ||
| 353 | |||
| 354 | inst = prom_devopen (path); | ||
| 355 | if (inst == -1) return 0; | ||
| 356 | node = prom_inst2pkg (inst); | ||
| 357 | prom_devclose (inst); | ||
| 358 | if (node == -1) return 0; | ||
| 359 | return node; | ||
| 360 | } | ||
diff --git a/arch/sparc/prom/tree_64.c b/arch/sparc/prom/tree_64.c index 691be68932f8..d93660048376 100644 --- a/arch/sparc/prom/tree_64.c +++ b/arch/sparc/prom/tree_64.c | |||
| @@ -374,24 +374,6 @@ inline phandle prom_inst2pkg(int inst) | |||
| 374 | return node; | 374 | return node; |
| 375 | } | 375 | } |
| 376 | 376 | ||
| 377 | /* Return 'node' assigned to a particular prom 'path' | ||
| 378 | * FIXME: Should work for v0 as well | ||
| 379 | */ | ||
| 380 | phandle prom_pathtoinode(const char *path) | ||
| 381 | { | ||
| 382 | phandle node; | ||
| 383 | int inst; | ||
| 384 | |||
| 385 | inst = prom_devopen (path); | ||
| 386 | if (inst == 0) | ||
| 387 | return 0; | ||
| 388 | node = prom_inst2pkg(inst); | ||
| 389 | prom_devclose(inst); | ||
| 390 | if (node == -1) | ||
| 391 | return 0; | ||
| 392 | return node; | ||
| 393 | } | ||
| 394 | |||
| 395 | int prom_ihandle2path(int handle, char *buffer, int bufsize) | 377 | int prom_ihandle2path(int handle, char *buffer, int bufsize) |
| 396 | { | 378 | { |
| 397 | unsigned long args[7]; | 379 | unsigned long args[7]; |
