Commit 0757060a authored by Stafford Horne's avatar Stafford Horne
Browse files

Merge branch 'pci/header-cleanup-immutable' of... 

Merge branch 'pci/header-cleanup-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git

The OpenRISC PCI support depends on the fixups done in the
pci/header-cleanup-immutable branch.  Also, there are OpenRISC
irqchip fixups in v5.19-rc6 that are needed to test the virt platform.

This merge creates a base for the OpenRISC PCI changes.
parents 32346491 933c5a4f

arch/alpha/include/asm/dma.h

+0 −9
Original line number Diff line number Diff line
@@ -365,13 +365,4 @@ extern void free_dma(unsigned int dmanr); /* release it again */ 
#define KERNEL_HAVE_CHECK_DMA

extern int check_dma(unsigned int dmanr);



/* From PCI */



#ifdef CONFIG_PCI

extern int isa_dma_bridge_buggy;

#else

#define isa_dma_bridge_buggy 	(0)

#endif





#endif /* _ASM_DMA_H */

arch/alpha/include/asm/pci.h

+0 −6
Original line number Diff line number Diff line
@@ -56,12 +56,6 @@ struct pci_controller { 


/* IOMMU controls.  */



/* TODO: integrate with include/asm-generic/pci.h ? */

static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

	return channel ? 15 : 14;

}



#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index



static inline int pci_proc_domain(struct pci_bus *bus)

arch/arc/include/asm/dma.h

+0 −5
Original line number Diff line number Diff line
@@ -7,10 +7,5 @@ 
#define ASM_ARC_DMA_H



#define MAX_DMA_ADDRESS 0xC0000000

#ifdef CONFIG_PCI

extern int isa_dma_bridge_buggy;

#else

#define isa_dma_bridge_buggy	0

#endif



#endif

arch/arm/include/asm/dma.h

+0 −6
Original line number Diff line number Diff line
@@ -143,10 +143,4 @@ extern int get_dma_residue(unsigned int chan); 


#endif /* CONFIG_ISA_DMA_API */



#ifdef CONFIG_PCI

extern int isa_dma_bridge_buggy;

#else

#define isa_dma_bridge_buggy    (0)

#endif



#endif /* __ASM_ARM_DMA_H */

arch/arm/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
#define HAVE_PCI_MMAP

#define ARCH_GENERIC_PCI_MMAP_RESOURCE



static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

	return channel ? 15 : 14;

}



extern void pcibios_report_status(unsigned int status_mask, int warn);



#endif /* __KERNEL__ */