Commit 5dc07a20 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Check pcie_find_root_port() return in x86 fixups to avoid NULL pointer
  dereferences (Samasth Norway Ananda)

- Make pci_bus_type constant (Kunwu Chan)

- Remove unused declarations of __pci_pme_wakeup() and pci_vpd_release()
  (Yue Haibing)

- Remove any leftover .*.cmd files with make clean (zhang jiao)

* pci/misc:
  PCI: Fix typos
  PCI/VPD: Remove pci_vpd_release() unused declarations
  PCI/PM: Remove __pci_pme_wakeup() unused declarations
  PCI: Make pci_bus_type constant
  x86/PCI: Check pcie_find_root_port() return for NULL
parents ca5c6568 5c7bdac7

arch/x86/pci/fixup.c

+2 −2
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ static void amd_rp_pme_suspend(struct pci_dev *dev) 
		return;



	rp = pcie_find_root_port(dev);

	if (!rp->pm_cap)

	if (!rp || !rp->pm_cap)

		return;



	rp->pme_support &= ~((PCI_PM_CAP_PME_D3hot|PCI_PM_CAP_PME_D3cold) >>
@@ -994,7 +994,7 @@ static void amd_rp_pme_resume(struct pci_dev *dev) 
	u16 pmc;



	rp = pcie_find_root_port(dev);

	if (!rp->pm_cap)

	if (!rp || !rp->pm_cap)

		return;



	pci_read_config_word(rp, rp->pm_cap + PCI_PM_PMC, &pmc);

drivers/pci/ats.c

+2 −2
Original line number Diff line number Diff line
@@ -455,8 +455,8 @@ void pci_restore_pasid_state(struct pci_dev *pdev) 
 * pci_pasid_features - Check which PASID features are supported

 * @pdev: PCI device structure

 *

 * Returns a negative value when no PASI capability is present.

 * Otherwise is returns a bitmask with supported features. Current

 * Return a negative value when no PASID capability is present.

 * Otherwise return a bitmask with supported features. Current

 * features reported are:

 * PCI_PASID_CAP_EXEC - Execute permission supported

 * PCI_PASID_CAP_PRIV - Privileged mode supported

drivers/pci/hotplug/cpqphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ get_slot_mapping(struct pci_bus *bus, u8 bus_num, u8 dev_num, u8 *slot) 
		} else {

			/* Did not get a match on the target PCI device. Check

			 * if the current IRQ table entry is a PCI-to-PCI

			 * bridge device.  If so, and it's secondary bus

			 * bridge device.  If so, and its secondary bus

			 * matches the bus number for the target device, I need

			 * to save the bridge's slot number.  If I can not find

			 * an entry for the target device, I will have to

drivers/pci/hotplug/s390_pci_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) 


static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)

{

	/* if the slot exits it always contains a function */

	/* if the slot exists it always contains a function */

	*value = 1;

	return 0;

}

drivers/pci/iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ EXPORT_SYMBOL_GPL(pci_iomap_wc); 
 * the different IOMAP ranges.

 *

 * But if the architecture does not use the generic iomap code, and if

 * it has _not_ defined it's own private pci_iounmap function, we define

 * it has _not_ defined its own private pci_iounmap function, we define

 * it here.

 *

 * NOTE! This default implementation assumes that if the architecture