Commit 58d2b6b6 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Remove resolved hotplug TODO item (Guilherme Giacomo Simoes)

- Fix typos (Bjorn Helgaas)

* pci/misc:
  PCI: Fix typos
  PCI: hotplug: Remove TODO about unused .get_power(), .hardware_test()
parents 0edfffd2 50fcd1c1

drivers/pci/controller/pcie-brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie, 
	 *

	 * The PCIe host controller by design must set the inbound viewport to

	 * be a contiguous arrangement of all of the system's memory.  In

	 * addition, its size mut be a power of two.  To further complicate

	 * addition, its size must be a power of two.  To further complicate

	 * matters, the viewport must start on a pcie-address that is aligned

	 * on a multiple of its size.  If a portion of the viewport does not

	 * represent system memory -- e.g. 3GB of memory requires a 4GB

drivers/pci/hotplug/TODO

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ Contributions are solicited in particular to remedy the following issues: 


cpcihp:



* There are no implementations of the ->hardware_test, ->get_power and

  ->set_power callbacks in struct cpci_hp_controller_ops.  Why were they

  introduced?  Can they be removed from the struct?



* Returned code from pci_hp_add_bridge() is not checked.



cpqphp:

drivers/pci/msi/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ int pci_msix_write_tph_tag(struct pci_dev *pdev, unsigned int index, u16 tag) 
	/*

	 * This is a horrible hack, but short of implementing a PCI

	 * specific interrupt chip callback and a huge pile of

	 * infrastructure, this is the minor nuissance. It provides the

	 * infrastructure, this is the minor nuisance. It provides the

	 * protection against concurrent operations on this entry and keeps

	 * the control word cache in sync.

	 */

drivers/pci/pcie/ptm.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ struct pci_ptm_debugfs *pcie_ptm_create_debugfs(struct device *dev, void *pdata, 
	if (!ops->check_capability)

		return NULL;



	/* Check for PTM capability before creating debugfs attrbutes */

	/* Check for PTM capability before creating debugfs attributes */

	ret = ops->check_capability(pdata);

	if (!ret) {

		dev_dbg(dev, "PTM capability not present\n");