- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f75866f..f4adba2 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/cpumask.h>
 #include <linux/pci-aspm.h>
-#include <acpi/acpi_hest.h>
 #include "pci.h"
 
 #define CARDBUS_LATENCY_TIMER  176     /* secondary latency timer */
@@ -904,12 +903,6 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev)
                pdev->is_hotplug_bridge = 1;
 }
 
-static void set_pci_aer_firmware_first(struct pci_dev *pdev)
-{
-       if (acpi_hest_firmware_first_pci(pdev))
-               pdev->aer_firmware_first = 1;
-}
-
 #define LEGACY_IO_RESOURCE     (IORESOURCE_IO | IORESOURCE_PCI_FIXED)
 
 /**
@@ -939,7 +932,6 @@ int pci_setup_device(struct pci_dev *dev)
        dev->multifunction = !!(hdr_type & 0x80);
        dev->error_state = pci_channel_io_normal;
        set_pcie_port_type(dev);
-       set_pci_aer_firmware_first(dev);
 
        list_for_each_entry(slot, &dev->bus->slots, list)
                if (PCI_SLOT(dev->devfn) == slot->number)
@@ -1212,11 +1204,6 @@ static void pci_init_capabilities(struct pci_dev *dev)
        /* Vital Product Data */
        pci_vpd_pci22_init(dev);
 
-#ifdef CONFIG_XEN
-       if (!is_initial_xendomain())
-               return;
-#endif
-
        /* Alternative Routing-ID Forwarding */
        pci_enable_ari(dev);
 
@@ -1338,20 +1325,13 @@ int pci_scan_slot(struct pci_bus *bus, int devfn)
                return 0; /* Already scanned the entire slot */
 
        dev = pci_scan_single_device(bus, devfn);
-       if (!dev) {
-#ifdef pcibios_scan_all_fns
-               if (!pcibios_scan_all_fns(bus, devfn))
-#endif
+       if (!dev)
                return 0;
-       } else if (!dev->is_added)
+       if (!dev->is_added)
                nr++;
 
        if (pci_ari_enabled(bus))
                next_fn = next_ari_fn;
-#ifdef pcibios_scan_all_fns
-       else if (pcibios_scan_all_fns(bus, devfn))
-               next_fn = next_trad_fn;
-#endif
        else if (dev->multifunction)
                next_fn = next_trad_fn;