Commit 94f543b2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Change pci_host_common_probe() visibility
  PCI: Fix typo pci_cfg_access_lock() comment
  PCI: Include pci.h for struct pci_ops definition
parents 13108c62 de5bbdd0

drivers/pci/access.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ void pci_vpd_release(struct pci_dev *dev) 
 *

 * When access is locked, any userspace reads or writes to config

 * space and concurrent lock requests will sleep until access is

 * allowed via pci_cfg_access_unlocked again.

 * allowed via pci_cfg_access_unlock() again.

 */

void pci_cfg_access_lock(struct pci_dev *dev)

{

include/linux/pci-ecam.h

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#ifndef DRIVERS_PCI_ECAM_H

#define DRIVERS_PCI_ECAM_H



#include <linux/pci.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>
@@ -68,7 +69,7 @@ extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */ 
extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */

#endif



#ifdef CONFIG_PCI_HOST_GENERIC

#ifdef CONFIG_PCI_HOST_COMMON

/* for DT-based PCI controllers that support ECAM */

int pci_host_common_probe(struct platform_device *pdev,

			  struct pci_ecam_ops *ops);