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

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

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



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
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 66ed5ef8

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -812,9 +812,9 @@ config DMA_COHERENT 


config DMA_NONCOHERENT

	bool

	select DMA_NEED_PCI_MAP_STATE

	select NEED_DMA_MAP_STATE



config DMA_NEED_PCI_MAP_STATE

config NEED_DMA_MAP_STATE

	bool



config SYS_HAS_EARLY_PRINTK

arch/mips/include/asm/pci.h

+1 −21
Original line number Diff line number Diff line
@@ -102,27 +102,7 @@ struct pci_dev; 
 */

extern unsigned int PCI_DMA_BUS_IS_PHYS;



#ifdef CONFIG_DMA_NEED_PCI_MAP_STATE



/* pci_unmap_{single,page} is not a nop, thus... */

#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))



#else /* CONFIG_DMA_NEED_PCI_MAP_STATE  */



/* pci_unmap_{page,single} is a nop so... */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)

#define pci_unmap_addr(PTR, ADDR_NAME)		(0)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)

#define pci_unmap_len(PTR, LEN_NAME)		(0)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)



#endif /* CONFIG_DMA_NEED_PCI_MAP_STATE  */

#include <linux/pci-dma.h>



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,