Commit 30fec3b8 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Add pci_clear_master() stub for non-CONFIG_PCI (Sui Jingfeng)

- Correct documentation typos (Randy Dunlap)

* pci/misc:
  Documentation: PCI: correct spelling
  PCI: Add pci_clear_master() stub for non-CONFIG_PCI
  PCI: Expand comment about sorting pci_ids.h entries
parents 283810ac b58d6d89

Documentation/PCI/endpoint/pci-vntb-howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ A sample configuration for NTB function is given below:: 
	# echo 1 > functions/pci_epf_vntb/func1/pci_epf_vntb.0/num_mws

	# echo 0x100000 > functions/pci_epf_vntb/func1/pci_epf_vntb.0/mw1



A sample configuration for virtual NTB driver for virutal PCI bus::

A sample configuration for virtual NTB driver for virtual PCI bus::



	# echo 0x1957 > functions/pci_epf_vntb/func1/pci_epf_vntb.0/vntb_vid

	# echo 0x080A > functions/pci_epf_vntb/func1/pci_epf_vntb.0/vntb_pid

Documentation/PCI/msi-howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ PCI_IRQ_MSI or PCI_IRQ_MSIX flags. 
List of device drivers MSI(-X) APIs

===================================



The PCI/MSI subystem has a dedicated C file for its exported device driver

The PCI/MSI subsystem has a dedicated C file for its exported device driver

APIs — `drivers/pci/msi/api.c`. The following functions are exported:



.. kernel-doc:: drivers/pci/msi/api.c

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -1903,6 +1903,7 @@ static inline int pci_dev_present(const struct pci_device_id *ids) 
#define pci_dev_put(dev)	do { } while (0)



static inline void pci_set_master(struct pci_dev *dev) { }

static inline void pci_clear_master(struct pci_dev *dev) { }

static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; }

static inline void pci_disable_device(struct pci_dev *dev) { }

static inline int pcim_enable_device(struct pci_dev *pdev) { return -EIO; }

include/linux/pci_ids.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 *	PCI Class, Vendor and Device IDs

 *

 *	Please keep sorted.

 *	Please keep sorted by numeric Vendor ID and Device ID.

 *

 *	Do not add new entries to this file unless the definitions

 *	are shared between multiple drivers.