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

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

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



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.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 af407c6d

arch/sh/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -183,6 +183,9 @@ config DMA_COHERENT 
config DMA_NONCOHERENT

	def_bool !DMA_COHERENT



config NEED_DMA_MAP_STATE

	def_bool DMA_NONCOHERENT



source "init/Kconfig"



source "kernel/Kconfig.freezer"

arch/sh/include/asm/pci.h

+1 −18
Original line number Diff line number Diff line
@@ -83,24 +83,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
 */

#define PCI_DMA_BUS_IS_PHYS	(dma_ops->is_phys)



/* pci_unmap_{single,page} being a nop depends upon the

 * configuration.

 */

#ifdef CONFIG_DMA_NONCOHERENT

#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

#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

#include <linux/pci-dma.h>



#ifdef CONFIG_PCI

/*