Commit 64099d98 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

pci/of: Consolidate pci_device_to_OF_node() 



All archs do more or less the same thing now, move it into
a single generic place.

I chose pci.h rather than of_pci.h to avoid having to change
all call-sites to include the later.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 3d5fe5a6

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

+0 −5
Original line number Diff line number Diff line
@@ -102,11 +102,6 @@ struct pci_controller { 
};



#ifdef CONFIG_PCI

static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)

{

	return dev->dev.of_node;

}



static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)

{

	return bus->dev.of_node;

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

+0 −5
Original line number Diff line number Diff line
@@ -169,11 +169,6 @@ static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus) 
	return bus->sysdata;

}



static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)

{

	return dev->dev.of_node;

}



static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)

{

	return bus->dev.of_node;

arch/sparc/include/asm/pci_32.h

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, 
}

#endif



struct device_node;

extern struct device_node *pci_device_to_OF_node(struct pci_dev *pdev);



#endif /* __KERNEL__ */



/* generic pci stuff */

arch/sparc/include/asm/pci_64.h

+0 −3
Original line number Diff line number Diff line
@@ -91,9 +91,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
	return PCI_IRQ_NONE;

}



struct device_node;

extern struct device_node *pci_device_to_OF_node(struct pci_dev *pdev);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

extern void pci_resource_to_user(const struct pci_dev *dev, int bar,

				 const struct resource *rsrc,

arch/sparc/kernel/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -1021,12 +1021,6 @@ void arch_teardown_msi_irq(unsigned int irq) 
}

#endif /* !(CONFIG_PCI_MSI) */



struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)

{

	return pdev->dev.of_node;

}

EXPORT_SYMBOL(pci_device_to_OF_node);



static void ali_sound_dma_hack(struct pci_dev *pdev, int set_bit)

{

	struct pci_dev *ali_isa_bridge;

CRA Git | Maintained and supported by SUSTech CRA and CCSE