Merge tag 'powerpc-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[tomoyo/tomoyo-test1.git] / arch / powerpc / platforms / 4xx / pci.c

diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/pci.c
index 07dcc2b..4862661 100644 (file)
--- a/arch/powerpc/platforms/4xx/pci.c
+++ b/arch/powerpc/platforms/4xx/pci.c
@@ -348,7 +348,7 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np)
        }
 
        /* Check if primary bridge */
-       if (of_get_property(np, "primary", NULL))
+       if (of_property_read_bool(np, "primary"))
                primary = 1;
 
        /* Get bus range if any */
@@ -530,7 +530,7 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np)
        struct pci_controller *hose = NULL;
        void __iomem *reg = NULL;
        const int *bus_range;
-       int big_pim = 0, msi = 0, primary = 0;
+       int big_pim, msi, primary;
 
        /* Fetch config space registers address */
        if (of_address_to_resource(np, 0, &rsrc_cfg)) {
@@ -546,16 +546,13 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np)
        }
 
        /* Check if it supports large PIMs (440GX) */
-       if (of_get_property(np, "large-inbound-windows", NULL))
-               big_pim = 1;
+       big_pim = of_property_read_bool(np, "large-inbound-windows");
 
        /* Check if we should enable MSIs inbound hole */
-       if (of_get_property(np, "enable-msi-hole", NULL))
-               msi = 1;
+       msi = of_property_read_bool(np, "enable-msi-hole");
 
        /* Check if primary bridge */
-       if (of_get_property(np, "primary", NULL))
-               primary = 1;
+       primary = of_property_read_bool(np, "primary");
 
        /* Get bus range if any */
        bus_range = of_get_property(np, "bus-range", NULL);
@@ -1915,14 +1912,13 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)
        struct resource dma_window;
        struct pci_controller *hose = NULL;
        const int *bus_range;
-       int primary = 0, busses;
+       int primary, busses;
        void __iomem *mbase = NULL, *cfg_data = NULL;
        const u32 *pval;
        u32 val;
 
        /* Check if primary bridge */
-       if (of_get_property(port->node, "primary", NULL))
-               primary = 1;
+       primary = of_property_read_bool(port->node, "primary");
 
        /* Get bus range if any */
        bus_range = of_get_property(port->node, "bus-range", NULL);