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

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

pci-dma: arm: use include/linux/pci-dma.h 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
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 08d925ba

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ config ARCH_MAY_HAVE_PC_FDC 
config ZONE_DMA

	bool



config NEED_DMA_MAP_STATE

       def_bool y



config GENERIC_ISA_DMA

	bool

arch/arm/include/asm/pci.h

+1 −10
Original line number Diff line number Diff line
@@ -30,16 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
 */

#define PCI_DMA_BUS_IS_PHYS     (1)



/*

 * Whether pci_unmap_{single,page} is a nop depends upon the

 * configuration.

 */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME;

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		__u32 LEN_NAME;

#define pci_unmap_addr(PTR, ADDR_NAME)		((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	(((PTR)->ADDR_NAME) = (VAL))

#define pci_unmap_len(PTR, LEN_NAME)		((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	(((PTR)->LEN_NAME) = (VAL))

#include <linux/pci-dma.h>



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,