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

Commit f67637ee authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

[PATCH] Add struct dev pointer to dma_is_consistent() 



dma_is_consistent() is ill-designed in that it does not have a struct
device pointer argument which makes proper support for systems that consist
of a mix of coherent and non-coherent DMA devices hard.  Change
dma_is_consistent to take a struct device pointer as first argument and fix
the sole caller to pass it.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 83b7b44e

Documentation/DMA-API.txt

+3 −3
Original line number Diff line number Diff line
@@ -431,10 +431,10 @@ be identical to those passed in (and returned by 
dma_alloc_noncoherent()).



int

dma_is_consistent(dma_addr_t dma_handle)

dma_is_consistent(struct device *dev, dma_addr_t dma_handle)



returns true if the memory pointed to by the dma_handle is actually

consistent.

returns true if the device dev is performing consistent DMA on the memory

area pointed to by the dma_handle.



int

dma_get_cache_alignment(void)

arch/mips/mm/dma-coherent.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ int dma_supported(struct device *dev, u64 mask) 


EXPORT_SYMBOL(dma_supported);



int dma_is_consistent(dma_addr_t dma_addr)

int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)

{

	return 1;

}

arch/mips/mm/dma-ip27.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int dma_supported(struct device *dev, u64 mask) 


EXPORT_SYMBOL(dma_supported);



int dma_is_consistent(dma_addr_t dma_addr)

int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)

{

	return 1;

}

arch/mips/mm/dma-ip32.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ int dma_supported(struct device *dev, u64 mask) 


EXPORT_SYMBOL(dma_supported);



int dma_is_consistent(dma_addr_t dma_addr)

int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)

{

	return 1;

}

arch/mips/mm/dma-noncoherent.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ int dma_supported(struct device *dev, u64 mask) 


EXPORT_SYMBOL(dma_supported);



int dma_is_consistent(dma_addr_t dma_addr)

int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)

{

	return 1;

}