Commit 062b26ba authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman
Browse files

powerpc/pci: Cleanup on struct pci_controller_ops 



Each PHB has one instance of "struct pci_controller_ops" that includes
various callbacks called by PCI subsystem. In the definition of this
struct, some callbacks have explicit names for its arguments, but the
left don't have.

This adds all explicit names of the arguments to the callbacks in
"struct pci_controller_ops" so that the code looks consistent. Also,
argument name @dev is replaced by @pdev as the later one is the
preferred name for PCI device.

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: default avatarDaniel Axtens <dja@axtens.net>
Reviewed-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 16aab321

arch/powerpc/include/asm/pci-bridge.h

+13 −12
Original line number Diff line number Diff line
@@ -17,33 +17,34 @@ struct device_node; 
 * PCI controller operations

 */

struct pci_controller_ops {

	void		(*dma_dev_setup)(struct pci_dev *dev);

	void		(*dma_dev_setup)(struct pci_dev *pdev);

	void		(*dma_bus_setup)(struct pci_bus *bus);



	int		(*probe_mode)(struct pci_bus *);

	int		(*probe_mode)(struct pci_bus *bus);



	/* Called when pci_enable_device() is called. Returns true to

	 * allow assignment/enabling of the device. */

	bool		(*enable_device_hook)(struct pci_dev *);

	bool		(*enable_device_hook)(struct pci_dev *pdev);



	void		(*disable_device)(struct pci_dev *);

	void		(*disable_device)(struct pci_dev *pdev);



	void		(*release_device)(struct pci_dev *);

	void		(*release_device)(struct pci_dev *pdev);



	/* Called during PCI resource reassignment */

	resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type);

	void		(*reset_secondary_bus)(struct pci_dev *dev);

	resource_size_t (*window_alignment)(struct pci_bus *bus,

					    unsigned long type);

	void		(*reset_secondary_bus)(struct pci_dev *pdev);



#ifdef CONFIG_PCI_MSI

	int		(*setup_msi_irqs)(struct pci_dev *dev,

	int		(*setup_msi_irqs)(struct pci_dev *pdev,

					  int nvec, int type);

	void		(*teardown_msi_irqs)(struct pci_dev *dev);

	void		(*teardown_msi_irqs)(struct pci_dev *pdev);

#endif



	int             (*dma_set_mask)(struct pci_dev *dev, u64 dma_mask);

	u64		(*dma_get_required_mask)(struct pci_dev *dev);

	int             (*dma_set_mask)(struct pci_dev *pdev, u64 dma_mask);

	u64		(*dma_get_required_mask)(struct pci_dev *pdev);



	void		(*shutdown)(struct pci_controller *);

	void		(*shutdown)(struct pci_controller *hose);

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE