Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f41b1771 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c7e67ac1

arch/alpha/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

arch/cris/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

arch/frv/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

arch/ia64/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -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,