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

Commit 2e94d445 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Revert "staging: android: ion: Use the MSM dmabuf ops when possible" 



This reverts commit b0cbb06d.
This commit is no longer needed, since the ION core now allows
for dmabuf ops to be overridable.

Change-Id: I32def4db2d7de97f465a82531367c78eeae8a4a1
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent a641971d

drivers/staging/android/ion/ion_dma_buf.c

+0 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/vmalloc.h>



#include "ion_private.h"

#include "heaps/msm_ion_priv.h"



static struct sg_table *dup_sg_table(struct sg_table *table)

{
@@ -348,11 +347,7 @@ struct dma_buf *ion_dmabuf_alloc(struct ion_device *dev, size_t len, 
	if (IS_ERR(buffer))

		return ERR_CAST(buffer);



#if IS_ENABLED(CONFIG_ION_MSM_HEAPS)

	exp_info.ops = &msm_ion_dma_buf_ops;

#else

	exp_info.ops = &dma_buf_ops;

#endif

	exp_info.size = buffer->size;

	exp_info.flags = O_RDWR;

	exp_info.priv = buffer;