Commit 475028ef authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/eeh: Remove eeh_dev_phb_init_dynamic() 



This function is a one line wrapper around eeh_phb_pe_create() and despite
the name it doesn't create any eeh_dev structures. Replace it with direct
calls to eeh_phb_pe_create() since that does what it says on the tin
and removes a layer of indirection.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200725081231.39076-1-oohall@gmail.com
parent 3f31e49d

arch/powerpc/include/asm/eeh.h

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ const char *eeh_pe_loc_get(struct eeh_pe *pe); 
struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe);



struct eeh_dev *eeh_dev_init(struct pci_dn *pdn);

void eeh_dev_phb_init_dynamic(struct pci_controller *phb);

void eeh_show_enabled(void);

int __init eeh_ops_register(struct eeh_ops *ops);

int __exit eeh_ops_unregister(const char *name);
@@ -362,6 +361,7 @@ static inline void eeh_remove_device(struct pci_dev *dev) { } 


#define EEH_POSSIBLE_ERROR(val, type) (0)

#define EEH_IO_ERROR_VALUE(size) (-1UL)

static inline int eeh_phb_pe_create(struct pci_controller *phb) { return 0; }

#endif /* CONFIG_EEH */



#if defined(CONFIG_PPC_PSERIES) && defined(CONFIG_EEH)

arch/powerpc/kernel/eeh.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ static int eeh_init(void) 


	/* Initialize PHB PEs */

	list_for_each_entry_safe(hose, tmp, &hose_list, list_node)

		eeh_dev_phb_init_dynamic(hose);

		eeh_phb_pe_create(hose);



	eeh_addr_cache_init();

arch/powerpc/kernel/eeh_dev.c

+0 −13
Original line number Diff line number Diff line
@@ -52,16 +52,3 @@ struct eeh_dev *eeh_dev_init(struct pci_dn *pdn) 


	return edev;

}
 


/**

 * eeh_dev_phb_init_dynamic - Create EEH devices for devices included in PHB

 * @phb: PHB

 *

 * Scan the PHB OF node and its child association, then create the

 * EEH devices accordingly

 */

void eeh_dev_phb_init_dynamic(struct pci_controller *phb)

{

	/* EEH PE for PHB */

	eeh_phb_pe_create(phb);

}

arch/powerpc/kernel/of_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ static int of_pci_phb_probe(struct platform_device *dev) 
	/* Init pci_dn data structures */

	pci_devs_phb_init_dynamic(phb);



	/* Create EEH PEs for the PHB */

	eeh_dev_phb_init_dynamic(phb);

	/* Create EEH PE for the PHB */

	eeh_phb_pe_create(phb);



	/* Scan the bus */

	pcibios_scan_phb(phb);

arch/powerpc/platforms/pseries/pci_dlpar.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct pci_controller *init_phb_dynamic(struct device_node *dn) 
	pci_devs_phb_init_dynamic(phb);



	/* Create EEH devices for the PHB */

	eeh_dev_phb_init_dynamic(phb);

	eeh_phb_pe_create(phb);



	if (dn->child)

		pseries_eeh_init_edev_recursive(PCI_DN(dn));

CRA Git | Maintained and supported by SUSTech CRA and CCSE