diff options
Diffstat (limited to 'arch/powerpc/boot/flatdevtree_misc.c')
-rw-r--r-- | arch/powerpc/boot/flatdevtree_misc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/boot/flatdevtree_misc.c b/arch/powerpc/boot/flatdevtree_misc.c index c7f9adbf827d..04da38fa477f 100644 --- a/arch/powerpc/boot/flatdevtree_misc.c +++ b/arch/powerpc/boot/flatdevtree_misc.c | |||
@@ -33,13 +33,9 @@ static int ft_setprop(const void *phandle, const char *propname, | |||
33 | return ft_set_prop(&cxt, phandle, propname, buf, buflen); | 33 | return ft_set_prop(&cxt, phandle, propname, buf, buflen); |
34 | } | 34 | } |
35 | 35 | ||
36 | static void ft_pack(void) | 36 | static unsigned long ft_finalize(void) |
37 | { | 37 | { |
38 | ft_end_tree(&cxt); | 38 | ft_end_tree(&cxt); |
39 | } | ||
40 | |||
41 | static unsigned long ft_addr(void) | ||
42 | { | ||
43 | return (unsigned long)cxt.bph; | 39 | return (unsigned long)cxt.bph; |
44 | } | 40 | } |
45 | 41 | ||
@@ -48,8 +44,7 @@ int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device) | |||
48 | dt_ops.finddevice = ft_finddevice; | 44 | dt_ops.finddevice = ft_finddevice; |
49 | dt_ops.getprop = ft_getprop; | 45 | dt_ops.getprop = ft_getprop; |
50 | dt_ops.setprop = ft_setprop; | 46 | dt_ops.setprop = ft_setprop; |
51 | dt_ops.ft_pack = ft_pack; | 47 | dt_ops.finalize = ft_finalize; |
52 | dt_ops.ft_addr = ft_addr; | ||
53 | 48 | ||
54 | return ft_open(&cxt, dt_blob, max_size, max_find_device, | 49 | return ft_open(&cxt, dt_blob, max_size, max_find_device, |
55 | platform_ops.realloc); | 50 | platform_ops.realloc); |