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

Commit d1aa06a1 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Sumit Semwal
Browse files

dma-buf: Remove unneeded sanity checks 



ops, ops->map_dma_buf and ops->unmap_dma_buf are guaranteed to be
non-NULL by a check in dma_buf_export(). Remove NULL checks on those
variables in the other API functions.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
parent 5375764f

drivers/base/dma-buf.c

+6 −9
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, 
	struct dma_buf_attachment *attach;

	int ret;



	if (WARN_ON(!dmabuf || !dev || !dmabuf->ops))

	if (WARN_ON(!dmabuf || !dev))

		return ERR_PTR(-EINVAL);



	attach = kzalloc(sizeof(struct dma_buf_attachment), GFP_KERNEL);
@@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(dma_buf_attach); 
 */

void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach)

{

	if (WARN_ON(!dmabuf || !attach || !dmabuf->ops))

	if (WARN_ON(!dmabuf || !attach))

		return;



	mutex_lock(&dmabuf->lock);
@@ -255,11 +255,10 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, 


	might_sleep();



	if (WARN_ON(!attach || !attach->dmabuf || !attach->dmabuf->ops))

	if (WARN_ON(!attach || !attach->dmabuf))

		return ERR_PTR(-EINVAL);



	mutex_lock(&attach->dmabuf->lock);

	if (attach->dmabuf->ops->map_dma_buf)

	sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction);

	mutex_unlock(&attach->dmabuf->lock);
@@ -278,12 +277,10 @@ EXPORT_SYMBOL_GPL(dma_buf_map_attachment); 
void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,

				struct sg_table *sg_table)

{

	if (WARN_ON(!attach || !attach->dmabuf || !sg_table

			    || !attach->dmabuf->ops))

	if (WARN_ON(!attach || !attach->dmabuf || !sg_table))

		return;



	mutex_lock(&attach->dmabuf->lock);

	if (attach->dmabuf->ops->unmap_dma_buf)

	attach->dmabuf->ops->unmap_dma_buf(attach, sg_table);

	mutex_unlock(&attach->dmabuf->lock);