1 files changed, 11 insertions, 11 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 0187829c3382..32656f105250 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -50,7 +50,7 @@ static int global_phb_number;		/* Global phb counter */
 resource_size_t isa_mem_base;
 
 /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
-unsigned int ppc_pci_flags = 0;
+unsigned int pci_flags = 0;
 
 
 static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
@@ -842,9 +842,9 @@ int pci_proc_domain(struct pci_bus *bus)
 {
         struct pci_controller *hose = pci_bus_to_host(bus);
 
-        if (!(ppc_pci_flags & PPC_PCI_ENABLE_PROC_DOMAINS))
+        if (!pci_has_flag(PCI_ENABLE_PROC_DOMAINS))
                 return 0;
-        if (ppc_pci_flags & PPC_PCI_COMPAT_DOMAIN_0)
+        if (pci_has_flag(PCI_COMPAT_DOMAIN_0))
                 return hose->global_number != 0;
         return 1;
 }
@@ -920,13 +920,13 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)
                 struct resource *res = dev->resource + i;
                 if (!res->flags)
                         continue;
-                /* On platforms that have PPC_PCI_PROBE_ONLY set, we don't
+                /* On platforms that have PCI_PROBE_ONLY set, we don't
                  * consider 0 as an unassigned BAR value. It's technically
                  * a valid value, but linux doesn't like it... so when we can
                  * re-assign things, we do so, but if we can't, we keep it
                  * around and hope for the best...
                  */
-                if (res->start == 0 && !(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
+                if (res->start == 0 && !pci_has_flag(PCI_PROBE_ONLY)) {
                         pr_debug("PCI:%s Resource %d %016llx-%016llx [%x] is unassigned\n",
                                  pci_name(dev), i,
                                  (unsigned long long)res->start,
@@ -973,7 +973,7 @@ static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
         int i;
 
         /* We don't do anything if PCI_PROBE_ONLY is set */
-        if (ppc_pci_flags & PPC_PCI_PROBE_ONLY)
+        if (pci_has_flag(PCI_PROBE_ONLY))
                 return 0;
 
         /* Job is a bit different between memory and IO */
@@ -1143,7 +1143,7 @@ void __devinit pci_fixup_cardbus(struct pci_bus *bus)
 
 static int skip_isa_ioresource_align(struct pci_dev *dev)
 {
-        if ((ppc_pci_flags & PPC_PCI_CAN_SKIP_ISA_ALIGN) &&
+        if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
             !(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
                 return 1;
         return 0;
@@ -1271,7 +1271,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
                          * and as such ensure proper re-allocation
                          * later.
                          */
-                        if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)
+                        if (pci_has_flag(PCI_REASSIGN_ALL_RSRC))
                                 goto clear_resource;
                         pr = pci_find_parent_resource(bus->self, res);
                         if (pr == res) {
@@ -1456,7 +1456,7 @@ void __init pcibios_resource_survey(void)
         list_for_each_entry(b, &pci_root_buses, node)
                 pcibios_allocate_bus_resources(b);
 
-        if (!(ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)) {
+        if (!pci_has_flag(PCI_REASSIGN_ALL_RSRC)) {
                 pcibios_allocate_resources(0);
                 pcibios_allocate_resources(1);
         }
@@ -1465,7 +1465,7 @@ void __init pcibios_resource_survey(void)
          * the low IO area and the VGA memory area if they intersect the
          * bus available resources to avoid allocating things on top of them
          */
-        if (!(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
+        if (!pci_has_flag(PCI_PROBE_ONLY)) {
                 list_for_each_entry(b, &pci_root_buses, node)
                         pcibios_reserve_legacy_regions(b);
         }
@@ -1473,7 +1473,7 @@ void __init pcibios_resource_survey(void)
         /* Now, if the platform didn't decide to blindly trust the firmware,
          * we proceed to assigning things that were left unassigned
          */
-        if (!(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
+        if (!pci_has_flag(PCI_PROBE_ONLY)) {
                 pr_debug("PCI: Assigning unassigned resources...\n");
                 pci_assign_unassigned_resources();
         }