Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'pci/misc' 

  - Mark fall-through switch cases before enabling -Wimplicit-fallthrough
    (Gustavo A. R. Silva)

  - Move DMA-debug PCI init from arch code to PCI core (Christoph Hellwig)

  - Fix pci_request_irq() usage of IRQF_ONESHOT when no handler is supplied
    (Heiner Kallweit)

  - Unify PCI and DMA direction #defines (Shunyong Yang)

  - Add PCI_DEVICE_DATA() macro (Andy Shevchenko)

  - Check for VPD completion before checking for timeout (Bert Kenward)

  - Limit Netronome NFP5000 config space size to work around erratum (Jakub
    Kicinski)

* pci/misc:
  PCI: Limit config space size for Netronome NFP5000
  PCI/VPD: Check for VPD access completion before checking for timeout
  PCI: Add PCI_DEVICE_DATA() macro to fully describe device ID entry
  PCI: Unify PCI and normal DMA direction definitions
  PCI: Use IRQF_ONESHOT if pci_request_irq() called with no handler
  PCI: Call dma_debug_add_bus() for pci_bus_type from PCI core
  PCI: Mark fall-through switch cases before enabling -Wimplicit-fallthrough

# Conflicts:
#	drivers/pci/hotplug/pciehp_ctrl.c
parents c0638a45 2538fb89

arch/powerpc/kernel/dma.c

+0 −3
Original line number Diff line number Diff line
@@ -357,9 +357,6 @@ EXPORT_SYMBOL_GPL(dma_get_required_mask); 


static int __init dma_init(void)

{

#ifdef CONFIG_PCI

	dma_debug_add_bus(&pci_bus_type);

#endif

#ifdef CONFIG_IBMVIO

	dma_debug_add_bus(&vio_bus_type);

#endif

arch/sh/drivers/pci/pci.c

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ static int __init pcibios_init(void) 
	for (hose = hose_head; hose; hose = hose->next)

		pcibios_scanbus(hose);



	dma_debug_add_bus(&pci_bus_type);



	pci_initialized = 1;



	return 0;

arch/x86/kernel/pci-dma.c

+0 −3
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ static int __init pci_iommu_init(void) 
{

	struct iommu_table_entry *p;



#ifdef CONFIG_PCI

	dma_debug_add_bus(&pci_bus_type);

#endif

	x86_init.iommu.iommu_init();



	for (p = __iommu_table; p < __iommu_table_end; p++) {

drivers/net/wireless/ralink/rt2x00/rt2x00pci.h

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ 
#include <linux/io.h>

#include <linux/pci.h>



/*

 * This variable should be used with the

 * pci_driver structure initialization.

 */

#define PCI_DEVICE_DATA(__ops)	.driver_data = (kernel_ulong_t)(__ops)



/*

 * PCI driver handlers.

 */

drivers/pci/hotplug/shpchp_ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -654,6 +654,7 @@ int shpchp_sysfs_enable_slot(struct slot *p_slot) 
	switch (p_slot->state) {

	case BLINKINGON_STATE:

		cancel_delayed_work(&p_slot->work);

		/* fall through */

	case STATIC_STATE:

		p_slot->state = POWERON_STATE;

		mutex_unlock(&p_slot->lock);
@@ -689,6 +690,7 @@ int shpchp_sysfs_disable_slot(struct slot *p_slot) 
	switch (p_slot->state) {

	case BLINKINGOFF_STATE:

		cancel_delayed_work(&p_slot->work);

		/* fall through */

	case STATIC_STATE:

		p_slot->state = POWEROFF_STATE;

		mutex_unlock(&p_slot->lock);