x86: delete __cpuinit usage from all x86 files

[linux-2.6-block.git] / arch / x86 / kernel / devicetree.c

diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index b1581527a236a2f1b0d9657f14f13b471f7725fb..69eb2fa254942e23537266c4e8a4d0a77c7ee04f 100644 (file)
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -133,7 +133,7 @@ static void x86_of_pci_irq_disable(struct pci_dev *dev)
 {
 }
 
-void __cpuinit x86_of_pci_init(void)
+void x86_of_pci_init(void)
 {
        pcibios_enable_irq = x86_of_pci_irq_enable;
        pcibios_disable_irq = x86_of_pci_irq_disable;
@@ -364,9 +364,7 @@ static void dt_add_ioapic_domain(unsigned int ioapic_num,
                 * and assigned so we can keep the 1:1 mapping which the ioapic
                 * is having.
                 */
-               ret = irq_domain_associate_many(id, 0, 0, NR_IRQS_LEGACY);
-               if (ret)
-                       pr_err("Error mapping legacy IRQs: %d\n", ret);
+               irq_domain_associate_many(id, 0, 0, NR_IRQS_LEGACY);
 
                if (num > NR_IRQS_LEGACY) {
                        ret = irq_create_strict_mappings(id, NR_IRQS_LEGACY,