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

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 77c1428..4bef5c2 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -106,14 +106,14 @@ config PCI_PF_STUB
          When in doubt, say N.
 
 config XEN_PCIDEV_FRONTEND
-        tristate "Xen PCI Frontend"
-        depends on X86 && XEN
-        select PCI_XEN
+       tristate "Xen PCI Frontend"
+       depends on X86 && XEN
+       select PCI_XEN
        select XEN_XENBUS_FRONTEND
-        default y
-        help
-          The PCI device frontend driver allows the kernel to import arbitrary
-          PCI devices from a PCI backend to support PCI driver domains.
+       default y
+       help
+         The PCI device frontend driver allows the kernel to import arbitrary
+         PCI devices from a PCI backend to support PCI driver domains.
 
 config PCI_ATS
        bool
@@ -180,12 +180,12 @@ config PCI_LABEL
        select NLS
 
 config PCI_HYPERV
-        tristate "Hyper-V PCI Frontend"
-        depends on X86_64 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && SYSFS
+       tristate "Hyper-V PCI Frontend"
+       depends on X86_64 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && SYSFS
        select PCI_HYPERV_INTERFACE
-        help
-          The PCI device frontend driver allows the kernel to import arbitrary
-          PCI devices from a PCI backend to support PCI driver domains.
+       help
+         The PCI device frontend driver allows the kernel to import arbitrary
+         PCI devices from a PCI backend to support PCI driver domains.
 
 source "drivers/pci/hotplug/Kconfig"
 source "drivers/pci/controller/Kconfig"

diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 0ba988b..625a031 100644 (file)
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -7,9 +7,9 @@ config PCIE_DW
        bool
 
 config PCIE_DW_HOST
-        bool
+       bool
        depends on PCI_MSI_IRQ_DOMAIN
-        select PCIE_DW
+       select PCIE_DW
 
 config PCIE_DW_EP
        bool
@@ -224,7 +224,7 @@ config PCIE_HISI_STB
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIE_DW_HOST
        help
-          Say Y here if you want PCIe controller support on HiSilicon STB SoCs
+         Say Y here if you want PCIe controller support on HiSilicon STB SoCs
 
 config PCI_MESON
        bool "MESON PCIe controller"

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index 6bff951..2128422 100644 (file)
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -837,7 +837,7 @@ static int vmd_suspend(struct device *dev)
        int i;
 
        for (i = 0; i < vmd->msix_count; i++)
-                devm_free_irq(dev, pci_irq_vector(pdev, i), &vmd->irqs[i]);
+               devm_free_irq(dev, pci_irq_vector(pdev, i), &vmd->irqs[i]);
 
        pci_save_state(pdev);
        return 0;

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index e7b493c..32455a7 100644 (file)
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -83,7 +83,7 @@ config HOTPLUG_PCI_CPCI_ZT5550
        depends on HOTPLUG_PCI_CPCI && X86
        help
          Say Y here if you have an Performance Technologies (formerly Intel,
-          formerly just Ziatech) Ziatech ZT5550 CompactPCI system card.
+         formerly just Ziatech) Ziatech ZT5550 CompactPCI system card.
 
          To compile this driver as a module, choose M here: the
          module will be called cpcihp_zt5550.

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 18627bb..0c71b4a 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -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.
  */
 

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 1d3de1e..1e88fd4 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -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>

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);
 
        /*

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index a241a09..4937a08 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -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);
 
 /*