[PATCH] powerpc: Kill _machine and hard-coded platform numbers

[linux-2.6-block.git] / arch / powerpc / platforms / powermac / pci.c

diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index de3f30e6b3330d8287cb3499213342c049aea17d..f5d8d15d74fad111a9c2a2fe9dddb5a66aa602e9 100644 (file)
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -1201,7 +1201,7 @@ void __init pmac_pcibios_after_init(void)
 #ifdef CONFIG_PPC32
 void pmac_pci_fixup_cardbus(struct pci_dev* dev)
 {
-       if (_machine != _MACH_Pmac)
+       if (!machine_is(powermac))
                return;
        /*
         * Fix the interrupt routing on the various cardbus bridges
@@ -1244,8 +1244,9 @@ void pmac_pci_fixup_pciata(struct pci_dev* dev)
         * On PowerMacs, we try to switch any PCI ATA controller to
        * fully native mode
         */
-       if (_machine != _MACH_Pmac)
+       if (!machine_is(powermac))
                return;
+
        /* Some controllers don't have the class IDE */
        if (dev->vendor == PCI_VENDOR_ID_PROMISE)
                switch(dev->device) {