Commit bc4b024a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Bjorn Helgaas
Browse files

PCI: Move pci_dma_* helpers to common code 



For a long time all architectures implement the pci_dma_* functions using
the generic DMA API, and they all use the same header to do so.

Move this header, pci-dma-compat.h, to include/linux and include it from
the generic pci.h instead of having each arch duplicate this include.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 611609bc

arch/alpha/include/asm/pci.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -65,13 +65,6 @@ extern void pcibios_set_master(struct pci_dev *dev); 
   decisions.  */

   decisions.  */

#define PCI_DMA_BUS_IS_PHYS  0

#define PCI_DMA_BUS_IS_PHYS  0





#ifdef CONFIG_PCI



/* implement the pci_ DMA API in terms of the generic device dma_ one */

#include <asm-generic/pci-dma-compat.h>



#endif



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

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

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

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

{

{

arch/arm/include/asm/pci.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define ASMARM_PCI_H

#define ASMARM_PCI_H





#ifdef __KERNEL__

#ifdef __KERNEL__

#include <asm-generic/pci-dma-compat.h>

#include <asm/mach/pci.h> /* for pci_sys_data */

#include <asm/mach/pci.h> /* for pci_sys_data */





extern unsigned long pcibios_min_io;

extern unsigned long pcibios_min_io;

arch/arm64/include/asm/pci.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>





#include <asm/io.h>

#include <asm/io.h>

#include <asm-generic/pci-dma-compat.h>





#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_MEM		0

#define PCIBIOS_MIN_MEM		0

arch/avr32/include/asm/pci.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -5,6 +5,4 @@ 




#define PCI_DMA_BUS_IS_PHYS	(1)

#define PCI_DMA_BUS_IS_PHYS	(1)





#include <asm-generic/pci-dma-compat.h>



#endif /* __ASM_AVR32_PCI_H__ */
 
#endif /* __ASM_AVR32_PCI_H__ */

arch/blackfin/include/asm/pci.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
#define _ASM_BFIN_PCI_H

#define _ASM_BFIN_PCI_H





#include <linux/scatterlist.h>

#include <linux/scatterlist.h>

#include <asm-generic/pci-dma-compat.h>

#include <asm-generic/pci.h>

#include <asm-generic/pci.h>





#define PCIBIOS_MIN_IO 0x00001000

#define PCIBIOS_MIN_IO 0x00001000

CRA Git | Maintained and supported by SUSTech CRA and CCSE