Commit 2a047e06 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: return an unsigned int from dma_map_sg{,_attrs} 



These can only return 0 for failure or the number of entries, so turn
the return value into an unsigned int.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
parent d03c5441

include/linux/dma-mapping.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -105,8 +105,8 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, 
		unsigned long attrs);

		unsigned long attrs);

void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size,

void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size,

		enum dma_data_direction dir, unsigned long attrs);

		enum dma_data_direction dir, unsigned long attrs);

int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, int nents,

unsigned int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,

		enum dma_data_direction dir, unsigned long attrs);

		int nents, enum dma_data_direction dir, unsigned long attrs);

void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,

void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,

				      int nents, enum dma_data_direction dir,

				      int nents, enum dma_data_direction dir,

				      unsigned long attrs);

				      unsigned long attrs);
@@ -166,8 +166,9 @@ static inline void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, 
		size_t size, enum dma_data_direction dir, unsigned long attrs)

		size_t size, enum dma_data_direction dir, unsigned long attrs)

{

{

}

}

static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,

static inline unsigned int dma_map_sg_attrs(struct device *dev,

		int nents, enum dma_data_direction dir, unsigned long attrs)

		struct scatterlist *sg, int nents, enum dma_data_direction dir,

		unsigned long attrs)

{

{

	return 0;

	return 0;

}

}

kernel/dma/mapping.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ static int __dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, 
 * dma_unmap_sg_attrs() should be used to unmap the buffer with the

 * dma_unmap_sg_attrs() should be used to unmap the buffer with the

 * original sg and original nents (not the value returned by this funciton).

 * original sg and original nents (not the value returned by this funciton).

 */

 */

int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,

unsigned int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,

		    int nents, enum dma_data_direction dir, unsigned long attrs)

		    int nents, enum dma_data_direction dir, unsigned long attrs)

{

{

	int ret;

	int ret;