Merge branch 'pci/trivial'
- Fix typos and comments (Bjorn Helgaas) - Fix Kconfig whitespace errors (Krzysztof Kozlowski) * pci/trivial: PCI: Fix indentation PCI: Fix typos PCI: Remove useless comments and tidy others PCI: Remove unnecessary includes # Conflicts: # drivers/pci/probe.c
This commit is contained in:
commit
7e124c4051
|
@ -185,8 +185,8 @@ static int get_children_props(struct device_node *dn, const int **drc_indexes,
|
|||
|
||||
|
||||
/* Verify the existence of 'drc_name' and/or 'drc_type' within the
|
||||
* current node. First obtain it's my-drc-index property. Next,
|
||||
* obtain the DRC info from it's parent. Use the my-drc-index for
|
||||
* current node. First obtain its my-drc-index property. Next,
|
||||
* obtain the DRC info from its parent. Use the my-drc-index for
|
||||
* correlation, and obtain/validate the requested properties.
|
||||
*/
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include <linux/pci.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/delay.h>
|
||||
|
|
|
@ -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);
|
||||
|
||||
/*
|
||||
|
|
|
@ -4033,7 +4033,6 @@ static void quirk_fixed_dma_alias(struct pci_dev *dev)
|
|||
if (id)
|
||||
pci_add_dma_alias(dev, id->driver_data);
|
||||
}
|
||||
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ADAPTEC2, 0x0285, quirk_fixed_dma_alias);
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue