Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

Pull PCI updates from Bjorn Helgaas:
 "Miscellaneous
   - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
   - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"

* tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
  PCI: Fix whitespace, capitalization, and spelling errors

diff --combined drivers/pci/hotplug/pciehp_acpi.c
index cff7cad,55ea2a0..eddddd4
--- 1/drivers/pci/hotplug/pciehp_acpi.c
--- 2/drivers/pci/hotplug/pciehp_acpi.c
+++ b/drivers/pci/hotplug/pciehp_acpi.c
@@@ -54,7 -54,7 +54,7 @@@ int pciehp_acpi_slot_detection_check(st
  {
        if (slot_detection_mode != PCIEHP_DETECT_ACPI)
                return 0;
 -      if (acpi_pci_detect_ejectable(DEVICE_ACPI_HANDLE(&dev->dev)))
 +      if (acpi_pci_detect_ejectable(ACPI_HANDLE(&dev->dev)))
                return 0;
        return -ENODEV;
  }
@@@ -78,7 -78,7 +78,7 @@@ static int __initdata dup_slot_id
  static int __initdata acpi_slot_detected;
  static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots);
  
- /* Dummy driver for dumplicate name detection */
+ /* Dummy driver for duplicate name detection */
  static int __init dummy_probe(struct pcie_device *dev)
  {
        u32 slot_cap;
@@@ -96,7 -96,7 +96,7 @@@
                        dup_slot_id++;
        }
        list_add_tail(&slot->list, &dummy_slots);
 -      handle = DEVICE_ACPI_HANDLE(&pdev->dev);
 +      handle = ACPI_HANDLE(&pdev->dev);
        if (!acpi_slot_detected && acpi_pci_detect_ejectable(handle))
                acpi_slot_detected = 1;
        return -ENODEV;         /* dummy driver always returns error */

diff --combined drivers/pci/pci-acpi.c
index f166126,92a49c2..577074e
--- 1/drivers/pci/pci-acpi.c
--- 2/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@@ -141,7 -141,7 +141,7 @@@ phys_addr_t acpi_pci_root_get_mcfg_addr
   * if (_PRW at S-state x)
   *    choose from highest power _SxD to lowest power _SxW
   * else // no _PRW at S-state x
-  *    choose highest power _SxD or any lower power
+  *    choose highest power _SxD or any lower power
   */
  
  static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
@@@ -173,14 -173,14 +173,14 @@@
  
  static bool acpi_pci_power_manageable(struct pci_dev *dev)
  {
 -      acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
 +      acpi_handle handle = ACPI_HANDLE(&dev->dev);
  
        return handle ? acpi_bus_power_manageable(handle) : false;
  }
  
  static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
  {
 -      acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
 +      acpi_handle handle = ACPI_HANDLE(&dev->dev);
        static const u8 state_conv[] = {
                [PCI_D0] = ACPI_STATE_D0,
                [PCI_D1] = ACPI_STATE_D1,
@@@ -217,7 -217,7 +217,7 @@@
  
  static bool acpi_pci_can_wakeup(struct pci_dev *dev)
  {
 -      acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
 +      acpi_handle handle = ACPI_HANDLE(&dev->dev);
  
        return handle ? acpi_bus_can_wakeup(handle) : false;
  }

diff --combined drivers/pci/pcie/aer/aerdrv_core.c
index 6b3a958,688e48e..b2c8881
--- 1/drivers/pci/pcie/aer/aerdrv_core.c
--- 2/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@@ -525,7 -525,7 +525,7 @@@ static void handle_error_source(struct 
  
        if (info->severity == AER_CORRECTABLE) {
                /*
-                * Correctable error does not need software intevention.
+                * Correctable error does not need software intervention.
                 * No need to go through error recovery process.
                 */
                pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
@@@ -574,7 -574,7 +574,7 @@@ void aer_recover_queue(int domain, unsi
        };
  
        spin_lock_irqsave(&aer_recover_ring_lock, flags);
 -      if (kfifo_put(&aer_recover_ring, &entry))
 +      if (kfifo_put(&aer_recover_ring, entry))
                schedule_work(&aer_recover_work);
        else
                pr_err("AER recover: Buffer overflow when recovering AER for %04x:%02x:%02x:%x\n",