Commit 3dc4d333 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/pm' 

- Convert documentation examples to generic power management (Bjorn
  Helgaas)

* pci/pm:
  PCI/doc: Convert examples to generic power management
parents 5a20930f 4f23bd5d

Documentation/PCI/pci-iov-howto.rst

+3 −4
Original line number Diff line number Diff line
@@ -125,14 +125,14 @@ Following piece of code illustrates the usage of the SR-IOV API. 
		...

	}



	static int dev_suspend(struct pci_dev *dev, pm_message_t state)

	static int dev_suspend(struct device *dev)

	{

		...



		return 0;

	}



	static int dev_resume(struct pci_dev *dev)

	static int dev_resume(struct device *dev)

	{

		...
@@ -165,8 +165,7 @@ Following piece of code illustrates the usage of the SR-IOV API. 
		.id_table =	dev_id_table,

		.probe =	dev_probe,

		.remove =	dev_remove,

		.suspend =	dev_suspend,

		.resume =	dev_resume,

		.driver.pm =	&dev_pm_ops,

		.shutdown =	dev_shutdown,

		.sriov_configure = dev_sriov_configure,

	};