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

Commit f9b67f00 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Sumit Semwal
Browse files

dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro 

Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
in highmem.h, the former can be aliased if any dma-buf user includes
that header.

I'm personally trying to include highmem.h inside scatterlist.h and this
breaks the dma-buf code proper.

Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.

To maintain consistency I've renamed all four of kmap* and kunmap* to be
map* and unmap*. (Even though only kmap_atomic presently conflicts.)

[1] https://www.spinics.net/lists/target-devel/msg15070.html



Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1492630570-879-1-git-send-email-logang@deltatee.com
parent 418d59ef

drivers/dma-buf/dma-buf.c

+8 −8
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) 
			  || !exp_info->ops->map_dma_buf

			  || !exp_info->ops->unmap_dma_buf

			  || !exp_info->ops->release

			  || !exp_info->ops->kmap_atomic

			  || !exp_info->ops->kmap

			  || !exp_info->ops->map_atomic

			  || !exp_info->ops->map

			  || !exp_info->ops->mmap)) {

		return ERR_PTR(-EINVAL);

	}
@@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num) 
{

	WARN_ON(!dmabuf);



	return dmabuf->ops->kmap_atomic(dmabuf, page_num);

	return dmabuf->ops->map_atomic(dmabuf, page_num);

}

EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
@@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num, 
{

	WARN_ON(!dmabuf);



	if (dmabuf->ops->kunmap_atomic)

		dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);

	if (dmabuf->ops->unmap_atomic)

		dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);

}

EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
@@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num) 
{

	WARN_ON(!dmabuf);



	return dmabuf->ops->kmap(dmabuf, page_num);

	return dmabuf->ops->map(dmabuf, page_num);

}

EXPORT_SYMBOL_GPL(dma_buf_kmap);
@@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num, 
{

	WARN_ON(!dmabuf);



	if (dmabuf->ops->kunmap)

		dmabuf->ops->kunmap(dmabuf, page_num, vaddr);

	if (dmabuf->ops->unmap)

		dmabuf->ops->unmap(dmabuf, page_num, vaddr);

}

EXPORT_SYMBOL_GPL(dma_buf_kunmap);

drivers/gpu/drm/armada/armada_gem.c

+4 −4
Original line number Diff line number Diff line
@@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { 
	.map_dma_buf	= armada_gem_prime_map_dma_buf,

	.unmap_dma_buf	= armada_gem_prime_unmap_dma_buf,

	.release	= drm_gem_dmabuf_release,

	.kmap_atomic	= armada_gem_dmabuf_no_kmap,

	.kunmap_atomic	= armada_gem_dmabuf_no_kunmap,

	.kmap		= armada_gem_dmabuf_no_kmap,

	.kunmap		= armada_gem_dmabuf_no_kunmap,

	.map_atomic	= armada_gem_dmabuf_no_kmap,

	.unmap_atomic	= armada_gem_dmabuf_no_kunmap,

	.map		= armada_gem_dmabuf_no_kmap,

	.unmap		= armada_gem_dmabuf_no_kunmap,

	.mmap		= armada_gem_dmabuf_mmap,

};

drivers/gpu/drm/drm_prime.c

+4 −4
Original line number Diff line number Diff line
@@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { 
	.map_dma_buf = drm_gem_map_dma_buf,

	.unmap_dma_buf = drm_gem_unmap_dma_buf,

	.release = drm_gem_dmabuf_release,

	.kmap = drm_gem_dmabuf_kmap,

	.kmap_atomic = drm_gem_dmabuf_kmap_atomic,

	.kunmap = drm_gem_dmabuf_kunmap,

	.kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,

	.map = drm_gem_dmabuf_kmap,

	.map_atomic = drm_gem_dmabuf_kmap_atomic,

	.unmap = drm_gem_dmabuf_kunmap,

	.unmap_atomic = drm_gem_dmabuf_kunmap_atomic,

	.mmap = drm_gem_dmabuf_mmap,

	.vmap = drm_gem_dmabuf_vmap,

	.vunmap = drm_gem_dmabuf_vunmap,

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+4 −4
Original line number Diff line number Diff line
@@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = { 
	.map_dma_buf = i915_gem_map_dma_buf,

	.unmap_dma_buf = i915_gem_unmap_dma_buf,

	.release = drm_gem_dmabuf_release,

	.kmap = i915_gem_dmabuf_kmap,

	.kmap_atomic = i915_gem_dmabuf_kmap_atomic,

	.kunmap = i915_gem_dmabuf_kunmap,

	.kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,

	.map = i915_gem_dmabuf_kmap,

	.map_atomic = i915_gem_dmabuf_kmap_atomic,

	.unmap = i915_gem_dmabuf_kunmap,

	.unmap_atomic = i915_gem_dmabuf_kunmap_atomic,

	.mmap = i915_gem_dmabuf_mmap,

	.vmap = i915_gem_dmabuf_vmap,

	.vunmap = i915_gem_dmabuf_vunmap,

drivers/gpu/drm/i915/selftests/mock_dmabuf.c

+4 −4
Original line number Diff line number Diff line
@@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = { 
	.map_dma_buf = mock_map_dma_buf,

	.unmap_dma_buf = mock_unmap_dma_buf,

	.release = mock_dmabuf_release,

	.kmap = mock_dmabuf_kmap,

	.kmap_atomic = mock_dmabuf_kmap_atomic,

	.kunmap = mock_dmabuf_kunmap,

	.kunmap_atomic = mock_dmabuf_kunmap_atomic,

	.map = mock_dmabuf_kmap,

	.map_atomic = mock_dmabuf_kmap_atomic,

	.unmap = mock_dmabuf_kunmap,

	.unmap_atomic = mock_dmabuf_kunmap_atomic,

	.mmap = mock_dmabuf_mmap,

	.vmap = mock_dmabuf_vmap,

	.vunmap = mock_dmabuf_vunmap,