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

Commit d6bd3a39 authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Linus Torvalds
Browse files

[PATCH] Move valid_dma_direction() from x86_64 to generic code 



As suggested by Muli Ben-Yehuda this function is moved to generic code as
may be useful for all archs.

[akpm@osdl.org: fix]
Signed-off-by: default avatarRolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d09d7ddf

arch/x86_64/kernel/pci-swiotlb.c

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#include <linux/pci.h>

#include <linux/cache.h>

#include <linux/module.h>

#include <asm/dma-mapping.h>

#include <linux/dma-mapping.h>



#include <asm/proto.h>

#include <asm/swiotlb.h>

#include <asm/dma.h>

drivers/net/fec_8xx/fec_main.c

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/mii.h>

#include <linux/ethtool.h>

#include <linux/bitops.h>

#include <linux/dma-mapping.h>



#include <asm/8xx_immap.h>

#include <asm/pgtable.h>
@@ -37,7 +38,6 @@ 
#include <asm/irq.h>

#include <asm/uaccess.h>

#include <asm/commproc.h>

#include <asm/dma-mapping.h>



#include "fec_8xx.h"

drivers/net/fs_enet/fs_enet.h

+1 −2
Original line number Diff line number Diff line
@@ -6,11 +6,10 @@ 
#include <linux/types.h>

#include <linux/list.h>

#include <linux/phy.h>

#include <linux/dma-mapping.h>



#include <linux/fs_enet_pd.h>



#include <asm/dma-mapping.h>



#ifdef CONFIG_CPM1

#include <asm/commproc.h>

include/asm-x86_64/dma-mapping.h

+0 −7
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ extern dma_addr_t bad_dma_address; 
extern struct dma_mapping_ops* dma_ops;

extern int iommu_merge;



static inline int valid_dma_direction(int dma_direction)

{

	return ((dma_direction == DMA_BIDIRECTIONAL) ||

		(dma_direction == DMA_TO_DEVICE) ||

		(dma_direction == DMA_FROM_DEVICE));

}



static inline int dma_mapping_error(dma_addr_t dma_addr)

{

	if (dma_ops->mapping_error)

include/linux/dma-mapping.h

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ enum dma_data_direction { 
#define DMA_28BIT_MASK	0x000000000fffffffULL

#define DMA_24BIT_MASK	0x0000000000ffffffULL



static inline int valid_dma_direction(int dma_direction)

{

	return ((dma_direction == DMA_BIDIRECTIONAL) ||

		(dma_direction == DMA_TO_DEVICE) ||

		(dma_direction == DMA_FROM_DEVICE));

}



#include <asm/dma-mapping.h>



/* Backwards compat, remove in 2.7.x */