diff options
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
-rw-r--r-- | arch/powerpc/sysdev/mpic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index bcfb900481f8..27e6f78739eb 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -970,7 +970,7 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
970 | mpic->spurious_vec = intvec_top; | 970 | mpic->spurious_vec = intvec_top; |
971 | 971 | ||
972 | /* Check for "big-endian" in device-tree */ | 972 | /* Check for "big-endian" in device-tree */ |
973 | if (node && get_property(node, "big-endian", NULL) != NULL) | 973 | if (node && of_get_property(node, "big-endian", NULL) != NULL) |
974 | mpic->flags |= MPIC_BIG_ENDIAN; | 974 | mpic->flags |= MPIC_BIG_ENDIAN; |
975 | 975 | ||
976 | 976 | ||
@@ -986,13 +986,13 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
986 | BUG_ON(paddr == 0 && node == NULL); | 986 | BUG_ON(paddr == 0 && node == NULL); |
987 | 987 | ||
988 | /* If no physical address passed in, check if it's dcr based */ | 988 | /* If no physical address passed in, check if it's dcr based */ |
989 | if (paddr == 0 && get_property(node, "dcr-reg", NULL) != NULL) | 989 | if (paddr == 0 && of_get_property(node, "dcr-reg", NULL) != NULL) |
990 | mpic->flags |= MPIC_USES_DCR; | 990 | mpic->flags |= MPIC_USES_DCR; |
991 | 991 | ||
992 | #ifdef CONFIG_PPC_DCR | 992 | #ifdef CONFIG_PPC_DCR |
993 | if (mpic->flags & MPIC_USES_DCR) { | 993 | if (mpic->flags & MPIC_USES_DCR) { |
994 | const u32 *dbasep; | 994 | const u32 *dbasep; |
995 | dbasep = get_property(node, "dcr-reg", NULL); | 995 | dbasep = of_get_property(node, "dcr-reg", NULL); |
996 | BUG_ON(dbasep == NULL); | 996 | BUG_ON(dbasep == NULL); |
997 | mpic->dcr_base = *dbasep; | 997 | mpic->dcr_base = *dbasep; |
998 | mpic->reg_type = mpic_access_dcr; | 998 | mpic->reg_type = mpic_access_dcr; |
@@ -1006,7 +1006,7 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
1006 | */ | 1006 | */ |
1007 | if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) { | 1007 | if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) { |
1008 | const u32 *reg; | 1008 | const u32 *reg; |
1009 | reg = get_property(node, "reg", NULL); | 1009 | reg = of_get_property(node, "reg", NULL); |
1010 | BUG_ON(reg == NULL); | 1010 | BUG_ON(reg == NULL); |
1011 | paddr = of_translate_address(node, reg); | 1011 | paddr = of_translate_address(node, reg); |
1012 | BUG_ON(paddr == OF_BAD_ADDR); | 1012 | BUG_ON(paddr == OF_BAD_ADDR); |