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

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

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



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: default avatarMatt Turner <mattst88@gmail.com>
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 3bc4e459

arch/alpha/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ config ZONE_DMA 
	bool

	default y



config NEED_DMA_MAP_STATE

       def_bool y



config GENERIC_ISA_DMA

	bool

	default y

arch/alpha/include/asm/pci.h

+1 −13
Original line number Diff line number Diff line
@@ -119,19 +119,7 @@ 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);



/* 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))

#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