提交 d1aa06a1 编写于 作者: L Laurent Pinchart 提交者: Sumit Semwal

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: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NSumit Semwal <sumit.semwal@linaro.org>
上级 5375764f
...@@ -185,7 +185,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, ...@@ -185,7 +185,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
struct dma_buf_attachment *attach; struct dma_buf_attachment *attach;
int ret; int ret;
if (WARN_ON(!dmabuf || !dev || !dmabuf->ops)) if (WARN_ON(!dmabuf || !dev))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
attach = kzalloc(sizeof(struct dma_buf_attachment), GFP_KERNEL); attach = kzalloc(sizeof(struct dma_buf_attachment), GFP_KERNEL);
...@@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(dma_buf_attach); ...@@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(dma_buf_attach);
*/ */
void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *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; return;
mutex_lock(&dmabuf->lock); mutex_lock(&dmabuf->lock);
...@@ -255,12 +255,11 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, ...@@ -255,12 +255,11 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach,
might_sleep(); might_sleep();
if (WARN_ON(!attach || !attach->dmabuf || !attach->dmabuf->ops)) if (WARN_ON(!attach || !attach->dmabuf))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
mutex_lock(&attach->dmabuf->lock); mutex_lock(&attach->dmabuf->lock);
if (attach->dmabuf->ops->map_dma_buf) sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction);
sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction);
mutex_unlock(&attach->dmabuf->lock); mutex_unlock(&attach->dmabuf->lock);
return sg_table; return sg_table;
...@@ -278,13 +277,11 @@ EXPORT_SYMBOL_GPL(dma_buf_map_attachment); ...@@ -278,13 +277,11 @@ EXPORT_SYMBOL_GPL(dma_buf_map_attachment);
void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
struct sg_table *sg_table) struct sg_table *sg_table)
{ {
if (WARN_ON(!attach || !attach->dmabuf || !sg_table if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
|| !attach->dmabuf->ops))
return; return;
mutex_lock(&attach->dmabuf->lock); mutex_lock(&attach->dmabuf->lock);
if (attach->dmabuf->ops->unmap_dma_buf) attach->dmabuf->ops->unmap_dma_buf(attach, sg_table);
attach->dmabuf->ops->unmap_dma_buf(attach, sg_table);
mutex_unlock(&attach->dmabuf->lock); mutex_unlock(&attach->dmabuf->lock);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册