public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 16:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci-dma: add linux/pci-dma.h to linux/pci.h

Browse source 
All the architectures properly set NEED_DMA_MAP_STATE now so we can safely
add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h
inclusion in arch's asm/pci.h

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
FUJITA Tomonori 2010-03-10 15:23:30 -08:00 • committed by Linus Torvalds
parent c7e67ac1f3
commit f41b177157
13 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/alpha/include/asm/pci.h
View file

@ -119,8 +119,6 @@ pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr)
extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int); extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int);
extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int); extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int);
#include <linux/pci-dma.h>
/* Map a set of buffers described by scatterlist in streaming mode for /* Map a set of buffers described by scatterlist in streaming mode for
PCI DMA. This is the scatter-gather version of the above PCI DMA. This is the scatter-gather version of the above
pci_map_single interface. Here the scatter gather list elements pci_map_single interface. Here the scatter gather list elements

2
arch/arm/include/asm/pci.h
View file

@ -30,8 +30,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
*/ */
#define PCI_DMA_BUS_IS_PHYS (1) #define PCI_DMA_BUS_IS_PHYS (1)
#include <linux/pci-dma.h>
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev, static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat, enum pci_dma_burst_strategy *strat,

2
arch/cris/include/asm/pci.h
View file

@ -44,8 +44,6 @@ struct pci_dev;
*/ */
#define PCI_DMA_BUS_IS_PHYS (1) #define PCI_DMA_BUS_IS_PHYS (1)
#include <linux/pci-dma.h>
#define HAVE_PCI_MMAP #define HAVE_PCI_MMAP
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine); enum pci_mmap_state mmap_state, int write_combine);

2
arch/frv/include/asm/pci.h
View file

@ -43,8 +43,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
/* Return the index of the PCI controller for device PDEV. */ /* Return the index of the PCI controller for device PDEV. */
#define pci_controller_num(PDEV) (0) #define pci_controller_num(PDEV) (0)
#include <linux/pci-dma.h>
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev, static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat, enum pci_dma_burst_strategy *strat,

2
arch/ia64/include/asm/pci.h
View file

@ -56,8 +56,6 @@ pcibios_penalize_isa_irq (int irq, int active)
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
#include <linux/pci-dma.h>
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev, static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat, enum pci_dma_burst_strategy *strat,

2
arch/mips/include/asm/pci.h
View file

@ -102,8 +102,6 @@ struct pci_dev;
*/ */
extern unsigned int PCI_DMA_BUS_IS_PHYS; extern unsigned int PCI_DMA_BUS_IS_PHYS;
#include <linux/pci-dma.h>
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev, static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat, enum pci_dma_burst_strategy *strat,

2
arch/parisc/include/asm/pci.h
View file

@ -183,8 +183,6 @@ struct pci_bios_ops {
void (*fixup_bus)(struct pci_bus *bus); void (*fixup_bus)(struct pci_bus *bus);
}; };
#include <linux/pci-dma.h>
/* /*
** Stuff declared in arch/parisc/kernel/pci.c ** Stuff declared in arch/parisc/kernel/pci.c
*/ */

2
arch/powerpc/include/asm/pci.h
View file

@ -141,8 +141,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
#define HAVE_PCI_LEGACY 1 #define HAVE_PCI_LEGACY 1
#include <linux/pci-dma.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
/* The PCI address space does not equal the physical memory address /* The PCI address space does not equal the physical memory address

2
arch/sh/include/asm/pci.h
View file

@ -83,8 +83,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
*/ */
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
#include <linux/pci-dma.h>
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* /*
* None of the SH PCI controllers support MWI, it is always treated as a * None of the SH PCI controllers support MWI, it is always treated as a

2
arch/sparc/include/asm/pci.h
View file

@ -6,8 +6,6 @@
#include <asm/pci_32.h> #include <asm/pci_32.h>
#endif #endif
#include <linux/pci-dma.h>
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
#endif #endif

2
arch/x86/include/asm/pci.h
View file

@ -108,8 +108,6 @@ void dma32_reserve_bootmem(void);
/* implement the pci_ DMA API in terms of the generic device dma_ one */ /* implement the pci_ DMA API in terms of the generic device dma_ one */
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
#include <linux/pci-dma.h>
/* generic pci stuff */ /* generic pci stuff */
#include <asm-generic/pci.h> #include <asm-generic/pci.h>
#define PCIBIOS_MAX_MEM_32 0xffffffff #define PCIBIOS_MAX_MEM_32 0xffffffff

2
arch/xtensa/include/asm/pci.h
View file

@ -56,8 +56,6 @@ struct pci_dev;
#define PCI_DMA_BUS_IS_PHYS (1) #define PCI_DMA_BUS_IS_PHYS (1)
#include <linux/pci-dma.h>
/* Map a range of PCI memory or I/O space for a device into user space */ /* Map a range of PCI memory or I/O space for a device into user space */
int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine); enum pci_mmap_state mmap_state, int write_combine);

1
include/linux/pci.h
View file

@ -904,6 +904,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
unsigned int command_bits, bool change_bridge); unsigned int command_bits, bool change_bridge);
/* kmem_cache style wrapper around pci_alloc_consistent() */ /* kmem_cache style wrapper around pci_alloc_consistent() */
#include <linux/pci-dma.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>
#define pci_pool dma_pool #define pci_pool dma_pool