pci-dma: add linux/pci-dma.h to linux/pci.h
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
Linus Torvalds
Родитель
c7e67ac1f3
Коммит
f41b177157
|
|
@ -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_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
|
||||
PCI DMA. This is the scatter-gather version of the above
|
||||
pci_map_single interface. Here the scatter gather list elements
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
|
|||
*/
|
||||
#define PCI_DMA_BUS_IS_PHYS (1)
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
|
||||
enum pci_dma_burst_strategy *strat,
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ struct pci_dev;
|
|||
*/
|
||||
#define PCI_DMA_BUS_IS_PHYS (1)
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#define HAVE_PCI_MMAP
|
||||
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
|
||||
enum pci_mmap_state mmap_state, int write_combine);
|
||||
|
|
|
|||
|
|
@ -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. */
|
||||
#define pci_controller_num(PDEV) (0)
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
|
||||
enum pci_dma_burst_strategy *strat,
|
||||
|
|
|
|||
|
|
@ -56,8 +56,6 @@ pcibios_penalize_isa_irq (int irq, int active)
|
|||
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
|
||||
enum pci_dma_burst_strategy *strat,
|
||||
|
|
|
|||
|
|
@ -102,8 +102,6 @@ struct pci_dev;
|
|||
*/
|
||||
extern unsigned int PCI_DMA_BUS_IS_PHYS;
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
|
||||
enum pci_dma_burst_strategy *strat,
|
||||
|
|
|
|||
|
|
@ -183,8 +183,6 @@ struct pci_bios_ops {
|
|||
void (*fixup_bus)(struct pci_bus *bus);
|
||||
};
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
/*
|
||||
** Stuff declared in arch/parisc/kernel/pci.c
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -141,8 +141,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
|
|||
|
||||
#define HAVE_PCI_LEGACY 1
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#ifdef CONFIG_PPC64
|
||||
|
||||
/* The PCI address space does not equal the physical memory address
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
/*
|
||||
* None of the SH PCI controllers support MWI, it is always treated as a
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
#include <asm/pci_32.h>
|
||||
#endif
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -108,8 +108,6 @@ void dma32_reserve_bootmem(void);
|
|||
/* implement the pci_ DMA API in terms of the generic device dma_ one */
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
|
||||
/* generic pci stuff */
|
||||
#include <asm-generic/pci.h>
|
||||
#define PCIBIOS_MAX_MEM_32 0xffffffff
|
||||
|
|
|
|||
|
|
@ -56,8 +56,6 @@ struct pci_dev;
|
|||
|
||||
#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 */
|
||||
int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
|
||||
enum pci_mmap_state mmap_state, int write_combine);
|
||||
|
|
|
|||
|
|
@ -904,6 +904,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
|
|||
unsigned int command_bits, bool change_bridge);
|
||||
/* kmem_cache style wrapper around pci_alloc_consistent() */
|
||||
|
||||
#include <linux/pci-dma.h>
|
||||
#include <linux/dmapool.h>
|
||||
|
||||
#define pci_pool dma_pool
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче