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

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

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



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
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 5cabbb62

arch/sparc/Kconfig

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

	default y if SPARC32



config NEED_DMA_MAP_STATE

	def_bool y



config GENERIC_ISA_DMA

	bool

	default y if SPARC32

arch/sparc/include/asm/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#include <asm/pci_32.h>

#endif



#include <linux/pci-dma.h>



#include <asm-generic/pci-dma-compat.h>



#endif

arch/sparc/include/asm/pci_32.h

+0 −14
Original line number Diff line number Diff line
@@ -32,20 +32,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 


struct pci_dev;



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



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,

arch/sparc/include/asm/pci_64.h

+0 −14
Original line number Diff line number Diff line
@@ -32,20 +32,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
 */

#define PCI_DMA_BUS_IS_PHYS	(0)



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



/* PCI IOMMU mapping bypass support. */



/* PCI 64-bit addressing works for all slots on all controller