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

Commit 6dabee73 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/trivial' into next 

* pci/trivial:
  PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTION
  PCI: Drop bogus default from ARCH_SUPPORTS_MSI
  PCI: cpqphp: Remove unreachable path
  PCI: Remove bus number resource debug messages
  PCI/AER: Print completion message at KERN_INFO to match starting message
  PCI: Fix drivers/pci/pci.c kernel-doc warnings
parents 78890b59 769ae543

drivers/pci/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#

config ARCH_SUPPORTS_MSI

	bool

	default n



config PCI_MSI

	bool "Message Signaled Interrupts (MSI and MSI-X)"

drivers/pci/hotplug/cpqphp_ctrl.c

+1 −20
Original line number Diff line number Diff line
@@ -2890,27 +2890,8 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func 
						func->mem_head = mem_node;

					} else

						return -ENOMEM;

				} else if ((temp_register & 0x0BL) == 0x04) {

					/* Map memory */

					base = temp_register & 0xFFFFFFF0;

					base = ~base + 1;



					dbg("CND:      length = 0x%x\n", base);

					mem_node = get_resource(&(resources->mem_head), base);



					/* allocate the resource to the board */

					if (mem_node) {

						base = mem_node->base;



						mem_node->next = func->mem_head;

						func->mem_head = mem_node;

					} else

						return -ENOMEM;

				} else if ((temp_register & 0x0BL) == 0x06) {

					/* Those bits are reserved, we can't handle this */

					return 1;

				} else {

					/* Requesting space below 1M */

					/* Reserved bits or requesting space below 1M */

					return NOT_ENOUGH_RESOURCES;

				}

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,7 @@ void pci_pme_wakeup_bus(struct pci_bus *bus) 


/**

 * pci_wakeup - Wake up a PCI device

 * @dev: Device to handle.

 * @pci_dev: Device to handle.

 * @ign: ignored parameter

 */

static int pci_wakeup(struct pci_dev *pci_dev, void *ign)

drivers/pci/pcie/aer/aerdrv_core.c

+2 −4
Original line number Diff line number Diff line
@@ -509,14 +509,12 @@ static void do_recovery(struct pci_dev *dev, int severity) 
				"resume",

				report_resume);



	dev_printk(KERN_DEBUG, &dev->dev,

		"AER driver successfully recovered\n");

	dev_info(&dev->dev, "AER: Device recovery successful\n");

	return;



failed:

	/* TODO: Should kernel panic here? */

	dev_printk(KERN_DEBUG, &dev->dev,

		"AER driver didn't recover\n");

	dev_info(&dev->dev, "AER: Device recovery failed\n");

}



/**

drivers/pci/probe.c

+0 −5
Original line number Diff line number Diff line
@@ -1748,11 +1748,6 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) 
			   "busn_res: can not insert %pR under %s%pR (conflicts with %s %pR)\n",

			    res, pci_is_root_bus(b) ? "domain " : "",

			    parent_res, conflict->name, conflict);

	else

		dev_printk(KERN_DEBUG, &b->dev,

			   "busn_res: %pR is inserted under %s%pR\n",

			   res, pci_is_root_bus(b) ? "domain " : "",

			   parent_res);



	return conflict == NULL;

}