From 36899ab25ebfa301f3f8d4e3bf2f52a0b0153cdb Mon Sep 17 00:00:00 2001 From: Seungpyo Hong Date: Fri, 30 Mar 2018 13:14:39 +0900 Subject: [PATCH] media: tsmux: remov the old ion interface Change-Id: I5f4977fcaf45a1be739d4c06fea811a113d51d95 Signed-off-by: Seungpyo Hong --- drivers/media/platform/exynos/tsmux/tsmux_dev.c | 9 +-------- drivers/media/platform/exynos/tsmux/tsmux_dev.h | 5 +---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/exynos/tsmux/tsmux_dev.c b/drivers/media/platform/exynos/tsmux/tsmux_dev.c index bcd2d87a5af7..cdb40c6365eb 100644 --- a/drivers/media/platform/exynos/tsmux/tsmux_dev.c +++ b/drivers/media/platform/exynos/tsmux/tsmux_dev.c @@ -473,7 +473,6 @@ int tsmux_ioctl_m2m_unmap_buf(struct tsmux_context *ctx, { int ret = 0; struct tsmux_device *tsmux_dev; - struct ion_client *client; print_tsmux(TSMUX_M2M, "%s++\n", __func__); @@ -481,7 +480,6 @@ int tsmux_ioctl_m2m_unmap_buf(struct tsmux_context *ctx, return -ENOMEM; tsmux_dev = ctx->tsmux_dev; - client = tsmux_dev->tsmux_ion_client; print_tsmux(TSMUX_M2M, "unmap m2m in_buf\n"); @@ -1416,9 +1414,7 @@ static int tsmux_probe(struct platform_device *pdev) spin_lock_init(&tsmux_dev->device_spinlock); - tsmux_dev->tsmux_ion_client = exynos_ion_client_create("tsmux"); - if (tsmux_dev->tsmux_ion_client == NULL) - print_tsmux(TSMUX_ERR, "exynos_ion_client_create failed\n"); + dma_set_mask(&pdev->dev, DMA_BIT_MASK(36)); tsmux_dev->ctx_cnt = 0; @@ -1460,9 +1456,6 @@ static int tsmux_remove(struct platform_device *pdev) iovmm_deactivate(tsmux_dev->dev); - if (tsmux_dev->tsmux_ion_client) - ion_client_destroy(tsmux_dev->tsmux_ion_client); - free_irq(tsmux_dev->irq, tsmux_dev); iounmap(tsmux_dev->regs_base); diff --git a/drivers/media/platform/exynos/tsmux/tsmux_dev.h b/drivers/media/platform/exynos/tsmux/tsmux_dev.h index 175cd0953705..10e7e7c09883 100644 --- a/drivers/media/platform/exynos/tsmux/tsmux_dev.h +++ b/drivers/media/platform/exynos/tsmux/tsmux_dev.h @@ -20,8 +20,7 @@ #include #include #include -#include -#include +#include #include #include @@ -37,7 +36,6 @@ enum otf_buf_state { }; struct tsmux_buffer_info { - struct ion_handle *handle; struct dma_buf *dmabuf; struct dma_buf_attachment *dmabuf_att; dma_addr_t dma_addr; @@ -59,7 +57,6 @@ struct tsmux_device { int ctx_cur; struct tsmux_context *ctx[TSMUX_MAX_CONTEXTS_NUM]; - struct ion_client *tsmux_ion_client; }; struct tsmux_context { -- 2.20.1