diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:32 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:32 -0400 |
commit | 359c2e2d2039029a8167fb00499296b228928024 (patch) | |
tree | a33b3a42c6bfb3e194db140afa12d955d887cf0d /arch | |
parent | 7e41e7b3f010f047f1b6cc0d13eab2591382367c (diff) |
ppc/pmac: remove no longer needed IDE quirk
IDE PMAC host driver and all IDE PCI host drivers use pci_enable_device()
nowadays so the following quirk in pmac_pcibios_after_init() can be removed.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 1c58db9d42cb..bcf50d7056e9 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
@@ -1144,28 +1144,6 @@ void __init pmac_pcibios_after_init(void) | |||
1144 | { | 1144 | { |
1145 | struct device_node* nd; | 1145 | struct device_node* nd; |
1146 | 1146 | ||
1147 | #ifdef CONFIG_BLK_DEV_IDE | ||
1148 | struct pci_dev *dev = NULL; | ||
1149 | |||
1150 | /* OF fails to initialize IDE controllers on macs | ||
1151 | * (and maybe other machines) | ||
1152 | * | ||
1153 | * Ideally, this should be moved to the IDE layer, but we need | ||
1154 | * to check specifically with Andre Hedrick how to do it cleanly | ||
1155 | * since the common IDE code seem to care about the fact that the | ||
1156 | * BIOS may have disabled a controller. | ||
1157 | * | ||
1158 | * -- BenH | ||
1159 | */ | ||
1160 | for_each_pci_dev(dev) { | ||
1161 | if ((dev->class >> 16) != PCI_BASE_CLASS_STORAGE) | ||
1162 | continue; | ||
1163 | if (pci_enable_device(dev)) | ||
1164 | printk(KERN_WARNING | ||
1165 | "pci: Failed to enable %s\n", pci_name(dev)); | ||
1166 | } | ||
1167 | #endif /* CONFIG_BLK_DEV_IDE */ | ||
1168 | |||
1169 | for_each_node_by_name(nd, "firewire") { | 1147 | for_each_node_by_name(nd, "firewire") { |
1170 | if (nd->parent && (of_device_is_compatible(nd, "pci106b,18") || | 1148 | if (nd->parent && (of_device_is_compatible(nd, "pci106b,18") || |
1171 | of_device_is_compatible(nd, "pci106b,30") || | 1149 | of_device_is_compatible(nd, "pci106b,30") || |