Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01fd61c0 authored Feb 27, 2018 by Sinan Kaya Committed by Bjorn Helgaas Mar 05, 2018

PCI: Add a return type for pci_reset_bridge_secondary_bus()



Add a return value to pci_reset_bridge_secondary_bus() so we can return an
error if the device doesn't become ready after the reset.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

parent abbcf0e2

drivers/pci/pci.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4229,9 +4229,11 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev)
	* Use the bridge control register to assert reset on the secondary bus.		* Use the bridge control register to assert reset on the secondary bus.
	* Devices on the secondary bus are left in power-on state.		* Devices on the secondary bus are left in power-on state.
	*/		*/
	void pci_reset_bridge_secondary_bus(struct pci_dev *dev)		int pci_reset_bridge_secondary_bus(struct pci_dev *dev)
	{		{
	pcibios_reset_secondary_bus(dev);		pcibios_reset_secondary_bus(dev);

			return 0;
	}		}
	EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus);		EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus);

include/linux/pci.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1095,7 +1095,7 @@ int pci_reset_bus(struct pci_bus *bus);
	int pci_try_reset_bus(struct pci_bus *bus);		int pci_try_reset_bus(struct pci_bus *bus);
	void pci_reset_secondary_bus(struct pci_dev *dev);		void pci_reset_secondary_bus(struct pci_dev *dev);
	void pcibios_reset_secondary_bus(struct pci_dev *dev);		void pcibios_reset_secondary_bus(struct pci_dev *dev);
	void pci_reset_bridge_secondary_bus(struct pci_dev *dev);		int pci_reset_bridge_secondary_bus(struct pci_dev *dev);
	void pci_update_resource(struct pci_dev *dev, int resno);		void pci_update_resource(struct pci_dev *dev, int resno);
	int __must_check pci_assign_resource(struct pci_dev *dev, int i);		int __must_check pci_assign_resource(struct pci_dev *dev, int i);
	int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);		int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);