From: Jeongtae Park Date: Sun, 17 Jun 2018 08:05:03 +0000 (+0900) Subject: [COMMON] fimc-is2: remvoe 'vb2_plane_cookie' operation X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0fe290e5c6876d3d0050b3c5dc5aa1bbb9d15e0c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] fimc-is2: remvoe 'vb2_plane_cookie' operation Change-Id: Ie955cbaa9eb934db4545234192c4e55689ee6d44 Signed-off-by: Jeongtae Park --- diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.c index 822cf8cbefca..353c2c227eb4 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.c +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.c @@ -53,12 +53,6 @@ static inline ulong fimc_is_vb2_ion_plane_kvaddr( return (ulong)vb2_plane_vaddr(&vbuf->vb.vb2_buf, plane); } -static inline ulong fimc_is_vb2_ion_plane_cookie( - struct fimc_is_vb2_buf *vbuf, u32 plane) -{ - return (ulong)vb2_plane_cookie(&vbuf->vb.vb2_buf, plane); -} - static dma_addr_t fimc_is_vb2_ion_plane_dvaddr( struct fimc_is_vb2_buf *vbuf, u32 plane) @@ -125,7 +119,6 @@ static void fimc_is_bufcon_unmap(struct fimc_is_vb2_buf *vbuf, const struct fimc_is_vb2_buf_ops fimc_is_vb2_buf_ops_ion = { .plane_kvaddr = fimc_is_vb2_ion_plane_kvaddr, - .plane_cookie = fimc_is_vb2_ion_plane_cookie, .plane_dvaddr = fimc_is_vb2_ion_plane_dvaddr, .bufcon_map = fimc_is_bufcon_map, .bufcon_unmap = fimc_is_bufcon_unmap, diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.h b/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.h index 531f402224df..d990cca68308 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.h +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-mem.h @@ -22,7 +22,6 @@ struct fimc_is_vb2_buf; struct fimc_is_vb2_buf_ops { ulong (*plane_kvaddr)(struct fimc_is_vb2_buf *vbuf, u32 plane); - ulong (*plane_cookie)(struct fimc_is_vb2_buf *vbuf, u32 plane); dma_addr_t (*plane_dvaddr)(struct fimc_is_vb2_buf *vbuf, u32 plane); dma_addr_t (*bufcon_map)(struct fimc_is_vb2_buf *vbuf, struct device *dev, int idx, struct dma_buf *dmabuf); void (*bufcon_unmap)(struct fimc_is_vb2_buf *vbuf, int idx);