Commit 0aa297e7 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/64: Move pci_device_from_OF_node() out of asm/pci-bridge.h 



Move pci_device_from_OF_node() in pci64.c because it needs definition
of struct device_node and is not worth inlining.

ppc32.c already has it in pci32.c.

That way pci-bridge.h doesn't need linux/of.h (Brought by asm/prom.h
via asm/pci.h)

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/3c88286b55413730d7784133993a46ef4a3607ce.1646767214.git.christophe.leroy@csgroup.eu
parent f206fdd9

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

+2 −12
Original line number Diff line number Diff line
@@ -170,10 +170,10 @@ static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus) 
	return bus->sysdata;

}



#ifndef CONFIG_PPC64



extern int pci_device_from_OF_node(struct device_node *node,

				   u8 *bus, u8 *devfn);

#ifndef CONFIG_PPC64



extern void pci_create_OF_bus_map(void);



#else	/* CONFIG_PPC64 */
@@ -235,16 +235,6 @@ struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev); 
void remove_sriov_vf_pdns(struct pci_dev *pdev);

#endif



static inline int pci_device_from_OF_node(struct device_node *np,

					  u8 *bus, u8 *devfn)

{

	if (!PCI_DN(np))

		return -ENODEV;

	*bus = PCI_DN(np)->busno;

	*devfn = PCI_DN(np)->devfn;

	return 0;

}



#if defined(CONFIG_EEH)

static inline struct eeh_dev *pdn_to_eeh_dev(struct pci_dn *pdn)

{

arch/powerpc/kernel/pci_64.c

+9 −0
Original line number Diff line number Diff line
@@ -285,3 +285,12 @@ int pcibus_to_node(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pcibus_to_node);

#endif



int pci_device_from_OF_node(struct device_node *np, u8 *bus, u8 *devfn)

{

	if (!PCI_DN(np))

		return -ENODEV;

	*bus = PCI_DN(np)->busno;

	*devfn = PCI_DN(np)->devfn;

	return 0;

}