Skip to content

Commit

Permalink
Merge branch 'pci/trivial'
Browse files Browse the repository at this point in the history
  - Cleanup PCI register definitions, typos, etc (Bjorn Helgaas)

  - Remove unnecessary use of user-space types in CPER (Bjorn Helgaas)

  - Cleanup setup-bus.c comments & whitespace (Nicholas Johnson)

* pci/trivial:
  PCI: Cleanup setup-bus.c comments and whitespace
  CPER: Remove unnecessary use of user-space types
  CPER: Add UEFI spec references
  PCI: Fix comment typos
  PCI: Cleanup register definition width and whitespace

# Conflicts:
#	drivers/pci/pci.c
#	drivers/pci/setup-bus.c
  • Loading branch information
Bjorn Helgaas committed May 13, 2019
2 parents f8587c8 + 0d60761 commit c7a1c2b
Show file tree
Hide file tree
Showing 6 changed files with 640 additions and 630 deletions.
2 changes: 1 addition & 1 deletion drivers/pci/controller/pci-host-generic.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Simple, generic PCI host controller driver targetting firmware-initialised
* Simple, generic PCI host controller driver targeting firmware-initialised
* systems and virtual machines (e.g. the PCI emulation provided by kvmtool).
*
* Copyright (C) 2014 ARM Limited
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/controller/pcie-iproc-msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ static void iproc_msi_handler(struct irq_desc *desc)

/*
* Now go read the tail pointer again to see if there are new
* oustanding events that came in during the above window.
* outstanding events that came in during the above window.
*/
} while (true);

Expand Down
Loading

0 comments on commit c7a1c2b

Please sign in to comment.