Commit c4f36c3a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/header-cleanup-immutable' 

- Remove pci_get_legacy_ide_irq(); use ATA_PRIMARY_IRQ() and
  ATA_SECONDARY_IRQ() instead (Stafford Horne)

- Remove isa_dma_bridge_buggy, except for x86_32, the only place it's used
  (Stafford Horne)

- Define ARCH_GENERIC_PCI_MMAP_RESOURCE for csky (Stafford Horne)

- Move common PCI definitions that arches sometimes override to
  asm-generic/pci.h (Stafford Horne)

- Include <linux/isa-dma.h> for 'isa_dma_bridge_buggy' when needed
  (bisection hole here) (Randy Dunlap)

* pci/header-cleanup-immutable:
  PCI: Stub __pci_ioport_map() for arches that don't support it at all
  x86/cyrix: include header linux/isa-dma.h
  asm-generic: Add new pci.h and use it
  csky: PCI: Define ARCH_GENERIC_PCI_MMAP_RESOURCE
  PCI: Move isa_dma_bridge_buggy out of asm/dma.h
  PCI: Remove pci_get_legacy_ide_irq() and asm-generic/pci.h
parents 805f91bc 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__ */