Commit d450f828 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc'

- Align checking of syscall user config accessor return codes (Heiner
  Kallweit)

- Fix "ordering" comment typos (Bjorn Helgaas)

- Fix 'ARM/TEXAS INSTRUMENT KEYSTONE CLOCKSOURCE' capitalization in
  MAINTAINERS (Bjorn Helgaas)

- Add Silicom Denmark vendor ID (Martin Hundebøll)

- Apply CONFIG_PCI_DEBUG to entire drivers/pci hierarchy (Junhao He)

- Remove WARN_ON(in_interrupt()) (Sebastian Andrzej Siewior)

* pci/misc:
  PCI: Remove WARN_ON(in_interrupt())
  PCI: Apply CONFIG_PCI_DEBUG to entire drivers/pci hierarchy
  PCI: Add Silicom Denmark vendor ID
  MAINTAINERS: Fix 'ARM/TEXAS INSTRUMENT KEYSTONE CLOCKSOURCE' capitalization
  Fix "ordering" comment typos
  PCI: Align checking of syscall user config accessors
parents 617e3a8b 9a147122
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2603,7 +2603,7 @@ L: linux-kernel@vger.kernel.org
S:	Maintained
F:	drivers/clk/keystone/
ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
ARM/TEXAS INSTRUMENT KEYSTONE CLOCKSOURCE
M:	Santosh Shilimkar <ssantosh@kernel.org>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-kernel@vger.kernel.org
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static inline int __test_facility(unsigned long nr, void *facilities)
}

/*
 * The test_facility function uses the bit odering where the MSB is bit 0.
 * The test_facility function uses the bit ordering where the MSB is bit 0.
 * That makes it easier to query facility bits with the bit number as
 * documented in the Principles of Operation.
 */
+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void qxl_drm_release(struct drm_device *dev)

	/*
	 * TODO: qxl_device_fini() call should be in qxl_pci_remove(),
	 * reodering qxl_modeset_fini() + qxl_device_fini() calls is
	 * reordering qxl_modeset_fini() + qxl_device_fini() calls is
	 * non-trivial though.
	 */
	qxl_modeset_fini(qdev);
+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ struct iwl_fw_dbg_trigger_time_event {
 * tx_bar: tid bitmap to configure on what tid the trigger should occur
 *	when a BAR is send (for an Rx BlocAck session).
 * frame_timeout: tid bitmap to configure on what tid the trigger should occur
 *	when a frame times out in the reodering buffer.
 *	when a frame times out in the reordering buffer.
 */
struct iwl_fw_dbg_trigger_ba {
	__le16 rx_ba_start;
+1 −1
Original line number Diff line number Diff line
@@ -36,4 +36,4 @@ obj-$(CONFIG_PCI_ENDPOINT) += endpoint/
obj-y				+= controller/
obj-y				+= switch/

ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
subdir-ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
Loading