Merge branch 'pci/trivial'

[platform/kernel/linux-rpi.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3cc1c32..512cb43 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2311,8 +2311,7 @@ void pcie_report_downtraining(struct pci_dev *dev)
 
 static void pci_init_capabilities(struct pci_dev *dev)
 {
-       /* Enhanced Allocation */
-       pci_ea_init(dev);
+       pci_ea_init(dev);               /* Enhanced Allocation */
 
        /* Setup MSI caps & disable MSI/MSI-X interrupts */
        pci_msi_setup_pci_dev(dev);
@@ -2320,35 +2319,16 @@ static void pci_init_capabilities(struct pci_dev *dev)
        /* Buffers for saving PCIe and PCI-X capabilities */
        pci_allocate_cap_save_buffers(dev);
 
-       /* Power Management */
-       pci_pm_init(dev);
-
-       /* Vital Product Data */
-       pci_vpd_init(dev);
-
-       /* Alternative Routing-ID Forwarding */
-       pci_configure_ari(dev);
-
-       /* Single Root I/O Virtualization */
-       pci_iov_init(dev);
-
-       /* Address Translation Services */
-       pci_ats_init(dev);
-
-       /* Page Request Interface */
-       pci_pri_init(dev);
-
-       /* Process Address Space ID */
-       pci_pasid_init(dev);
-
-       /* Enable ACS P2P upstream forwarding */
-       pci_enable_acs(dev);
-
-       /* Precision Time Measurement */
-       pci_ptm_init(dev);
-
-       /* Advanced Error Reporting */
-       pci_aer_init(dev);
+       pci_pm_init(dev);               /* Power Management */
+       pci_vpd_init(dev);              /* Vital Product Data */
+       pci_configure_ari(dev);         /* Alternative Routing-ID Forwarding */
+       pci_iov_init(dev);              /* Single Root I/O Virtualization */
+       pci_ats_init(dev);              /* Address Translation Services */
+       pci_pri_init(dev);              /* Page Request Interface */
+       pci_pasid_init(dev);            /* Process Address Space ID */
+       pci_enable_acs(dev);            /* Enable ACS P2P upstream forwarding */
+       pci_ptm_init(dev);              /* Precision Time Measurement */
+       pci_aer_init(dev);              /* Advanced Error Reporting */
 
        pcie_report_downtraining(dev);
 
@@ -2420,13 +2400,10 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
        /* Fix up broken headers */
        pci_fixup_device(pci_fixup_header, dev);
 
-       /* Moved out from quirk header fixup code */
        pci_reassigndev_resource_alignment(dev);
 
-       /* Clear the state_saved flag */
        dev->state_saved = false;
 
-       /* Initialize various capabilities */
        pci_init_capabilities(dev);
 
        /*